head 1.20; access; symbols pkgsrc-2026Q1:1.19.0.2 pkgsrc-2026Q1-base:1.19 pkgsrc-2025Q4:1.18.0.2 pkgsrc-2025Q4-base:1.18 pkgsrc-2025Q3:1.17.0.4 pkgsrc-2025Q3-base:1.17 pkgsrc-2025Q2:1.17.0.2 pkgsrc-2025Q2-base:1.17 pkgsrc-2025Q1:1.16.0.4 pkgsrc-2025Q1-base:1.16 pkgsrc-2024Q4:1.16.0.2 pkgsrc-2024Q4-base:1.16 pkgsrc-2024Q3:1.12.0.2 pkgsrc-2024Q3-base:1.12 pkgsrc-2024Q2:1.11.0.2 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.7.0.4 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.2 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.4.0.2 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.3.0.2 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.2.0.2 pkgsrc-2023Q1-base:1.2; locks; strict; comment @# @; 1.20 date 2026.05.22.08.19.34; author pin; state Exp; branches; next 1.19; commitid MTGOqYVMBLpALMGG; 1.19 date 2026.01.07.08.46.30; author wiz; state Exp; branches; next 1.18; commitid 1wQ3ICD8eebefrpG; 1.18 date 2025.10.21.08.22.13; author wiz; state Exp; branches; next 1.17; commitid hnGWMomxJ48WCpfG; 1.17 date 2025.04.17.21.50.19; author wiz; state Exp; branches; next 1.16; commitid xcIXAVA292fk6sRF; 1.16 date 2024.11.14.22.19.20; author wiz; state Exp; branches; next 1.15; commitid JmuDYqwL4erbdFxF; 1.15 date 2024.11.01.12.52.05; author wiz; state Exp; branches; next 1.14; commitid QB4Wk02mZPuBuWvF; 1.14 date 2024.11.01.00.51.18; author wiz; state Exp; branches; next 1.13; commitid QT27BdVP362gvSvF; 1.13 date 2024.10.16.10.02.34; author pin; state Exp; branches; next 1.12; commitid PiJ5UfTLltwM4StF; 1.12 date 2024.07.31.17.54.21; author pin; state Exp; branches; next 1.11; commitid WwRbmVEu4qi5a1kF; 1.11 date 2024.05.29.16.32.02; author adam; state Exp; branches; next 1.10; commitid n8aFyEjEVZA0JUbF; 1.10 date 2024.05.06.08.40.23; author jperkin; state Exp; branches; next 1.9; commitid Xm6R3peSH7EgRU8F; 1.9 date 2024.05.06.08.33.50; author jperkin; state Exp; branches; next 1.8; commitid zdGocoi70U9aPU8F; 1.8 date 2024.05.06.08.27.50; author jperkin; state Exp; branches; next 1.7; commitid YcrhyZVPKZ0TMU8F; 1.7 date 2023.11.08.13.18.44; author wiz; state Exp; branches; next 1.6; commitid PsuHTklAIsF4bOLE; 1.6 date 2023.10.24.22.08.44; author wiz; state Exp; branches; next 1.5; commitid MTsrqKm6aGrQAVJE; 1.5 date 2023.10.21.18.57.14; author pin; state Exp; branches; next 1.4; commitid Inykup2ZgEmBDwJE; 1.4 date 2023.08.30.08.30.17; author pin; state Exp; branches; next 1.3; commitid gf9Pwn7QyEZaQMCE; 1.3 date 2023.04.19.08.09.41; author adam; state Exp; branches; next 1.2; commitid B8gCWhWtMX9vZGlE; 1.2 date 2023.03.17.21.20.59; author pin; state Exp; branches; next 1.1; commitid GiHRsrSBZEHorwhE; 1.1 date 2023.01.12.12.51.30; author pin; state Exp; branches; next ; commitid XdQZZ8PlqH35Gf9E; desc @@ 1.20 log @devel/git-branchless: update to 0.11.1 v0.11.1 Release highlights None. This is a fixup release that includes no new features or changes in behavior. Changed (#1672): scm-bisect has been updated (was missed in v0.11.0) v0.11.0 Release highlights This release includes a number of new features and changes; including: Rust v1.86 or later is required to build. A new git split command was introduced. Revsets gained a new ! operator, as well some performance improvements. record and amend can now detect and add new, untracked files. record gained several new options, and a breaking change to another; see below. smartlog received rendering updates, a new setting, and a deprecation; see below. For full details on the numerous other features, changes and fixes, see below. Additionally, this is the first release managed by @@claytonrcarter. If something seems amiss or is not packaged correctly, please mention it in discussion, or open an issue. Added (#1461): added ! revset postfix operator as shortcut for "only child" (#1464): created git split command to extract changes from a commit (#1603): added git move --dry-run to test in-memory rebases (#1604): git record and git amend can now automatically detect and begin tracking new files (optional, disabled by default) (#1612): added git record --new to create new, empty commits (#1631): the --reparent flag, previously only available to git amend, is now available to git move, git restack, git split, git sync and git test (#1632): added git record --fixup option, to create a fixup commit (similar to reword --fixup) Changed (#1270): git smartlog now renders with curved corners (#1271): git smartlog renders commit nodes more consistently with other nodes (#1315): git smartlog now reads the branchless.smartlog.reverse config setting (the --reverse option has been deprecated) (#1462) BREAKING: git record will use a default commit message with --stash (instead of prompting for one) (#1463): git switch now accepts a revset whose sole head will be checked out, and correctly treats - to mean last checked out commit or branch (#1492): scm-record upgraded to v0.5.0. (#1591): improved performance of some revset expressions (#1593) BREAKING: The minimum supported Rust version (MSRV) is now 1.82. See #1638 below. (#1638) BREAKING: The minimum supported Rust version (MSRV) is now 1.86, and the rust edition is now 2024. (#1661): add nix devshell (and other nix updates and fixes) Fixed (#1439): fix panic with custom git status configuration (#1611): fix behavior of git record --stash on a detached HEAD (#1618): fix behavior of various commands when operating on branches that have the same name as files in the current directory (#1647): correctly describe behavior of when check out target is omitted to git switch (#1651): fix panic when running git-brancless commands in bare repos (#1659): fix snapshotting for submodules and symlinks ending in a / @ text @# $NetBSD: Makefile,v 1.19 2026/01/07 08:46:30 wiz Exp $ DISTNAME= git-branchless-0.11.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=arxanas/} GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@@NetBSD.org HOMEPAGE= https://github.com/arxanas/git-branchless/ COMMENT= High-velocity, monorepo-scale workflow for Git LICENSE= mit OR apache-2.0 .include "cargo-depends.mk" RUST_REQ= 1.86.0 USE_TOOLS+= pkg-config INSTALLATION_DIRS= bin RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib SUBST_CLASSES+= indexedlog-netbsd SUBST_STAGE.indexedlog-netbsd= pre-configure SUBST_FILES.indexedlog-netbsd= ../vendor/sapling-indexedlog-0.1.0/Cargo.toml SUBST_SED.indexedlog-netbsd= -e 's|cfg(target_os = \\"linux\\")|cfg(any(target_os = \\"linux\\", target_os = \\"netbsd\\"))|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/target/release/git-branchless \ ${DESTDIR}${PREFIX}/bin DEPENDS+= git-base-[0-9]*:../../devel/git-base .include "../../lang/rust/cargo.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" @ 1.19 log @*: recursive bump for icu 78.1 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2025/10/21 08:22:13 wiz Exp $ d3 1 a3 2 DISTNAME= git-branchless-0.10.0 PKGREVISION= 5 a12 3 # https://github.com/arxanas/git-branchless/issues/1585 BROKEN= "Does not build with rust 1.90" d15 1 a15 1 RUST_REQ= 1.74.0 d22 4 a25 2 post-patch: ${CP} ${FILESDIR}/netbsd.rs ${WRKDIR}/vendor/ioctl-rs-0.1.6/src/os/ d31 2 a33 1 .include "../../security/openssl/buildlink3.mk" @ 1.18 log @git-branchless: mark as BROKEN Does not build with rust 1.90 Link to upstream ticket. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2025/04/17 21:50:19 wiz Exp $ d4 1 a4 1 PKGREVISION= 4 @ 1.17 log @*: recursive bump for icu 77 and libxml2 2.14 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2024/11/14 22:19:20 wiz Exp $ d14 3 @ 1.16 log @*: recursive bump for icu 76 shlib major version bump @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2024/11/01 12:52:05 wiz Exp $ d4 1 a4 1 PKGREVISION= 3 @ 1.15 log @*: revbump for icu downgrade @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2024/11/01 00:51:18 wiz Exp $ d4 1 a4 1 PKGREVISION= 2 @ 1.14 log @*: recursive bump for icu 76.1 shlib bump @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2024/10/16 10:02:34 pin Exp $ d4 1 a4 1 PKGREVISION= 1 @ 1.13 log @devel/git-branchless: update to 0.10.0 Release highlights This is primarily a bugfix release: Supports Git v2.46's reference-transaction updated format (thanks to @@jblebrun). Supports Git's index format v4 (thanks to @@samueltardieu). Fixes to the interactive commit selector (see scm-record v0.4.0). Added (#1355): git submit now supports the --jobs argument for parallelism. Changed git2 upgraded to v0.19.0. libgit2 upgraded to v1.8.1. scm-record upgraded to v0.4.0. Fixed (#1322): Fixed the processing of symbolic refs in reference-transaction lines (since Git v2.46+). (#1353): git submit with the Phabricator forge now ignores untracked working copy changes. (#1363): git-branchless now supports index version 4 (via libgit2 upgrade). (#1393): Branches with multivars in their configuration can now be deleted (via libgit2 upgrade). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2024/07/31 17:54:21 pin Exp $ d4 1 @ 1.12 log @devel/git-branchless: update to 0.9.0 Release highlights The Apache and MIT license files are now distributed with all git-branchless sub-crates as required. Rust v1.74 or later is required to build. There are breaking changes to git hide and git sync; see below. Broken support for native Windows/Powershell due to bad hook invocations was probably fixed. If this was affecting you, please comment on #370 to confirm or refute. New merges() and branches() revset functions were introduced. Changelog See also the release notes for scm-record v0.3.0. Added (#1129) Added a --dry-run option to git submit to report what would be submitted without actually doing so. (#1130) Added merges() revset function. (#1130) The branches() revset function now accepts an optional text pattern argument to limit which branches are matched. (#1150) The git record command now accepts -s/--stash to return to the previous commit immediately after committing. (#1167) The commit message for a new commit can now be written/edited during git record --interactive. (#1169) git record now accepts multiple --message arguments. (#1184) An initial Github forge was implemented as git submit --forge github, but it's too buggy for general use. (#1241) git smartlog now accepts --exact to skip rendering HEAD and the main branch. (#1244) git submit now accepts multiple arguments/revsets. Changed BREAKING (#1128) Arguments/revsets passed to git sync are now resolved to their respective stacks. This allows git sync my-branch to work as expected, instead of needing to use git sync 'stack(my-branch)'. The behavior of git sync when called without arguments is not affected by this change. If you rely on the previous behavior, please use git move -x -d 'main()' instead. BREAKING (#1152) Previously, git hide would not delete branches pointing to the hidden commits unless -D/--delete-branches was passed. Now, deleting branches is the default behavior. Pass --no-delete-branches to restore the old behavior. BREAKING (#1292): The minimum supported Rust version (MSRV) is now 1.74. (#1204) The default instructions for git reword are now wrapped to 72 characters. (#1230) The icon for omitted commits in the smartlog was changed from ⊘ to ◌. Fixed (#1071) The Apache and MIT licenses are now distributed with each constituent crate, not just the top-level git-branchless crate. (#1072) The current branch is no longer detached during git amend when the current commit has descendants. (#1073) Merge commits can now be amended with git amend. (#1095) The event log is now shared between all worktrees. Before, commits that were made in one worktree wouldn't be visible in other worktrees, etc. (#1095) git submit now runs in worktree that you invoked it in. (#1095) git submit --forge phabricator no longer records spurious commits when arc diffing. (#1127) Improved support for files with spaces in their name. (#1267) The correct "path" variable is now used on Windows, which fixes some cases of git-branchless failing on native Windows. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2024/05/29 16:32:02 adam Exp $ d3 1 a3 1 DISTNAME= git-branchless-0.9.0 d15 1 a15 3 #RUST_REQ 1.79.0 #Upstream does not state the required MSRV. #This package is confirmed to build with Rust 1.79.0 on amd64 a19 1 RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib a30 1 .include "../../devel/ncurses/buildlink3.mk" @ 1.11 log @revbump after icu and protobuf updates @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2024/05/06 08:40:23 jperkin Exp $ d3 1 a3 2 DISTNAME= git-branchless-0.8.0 PKGREVISION= 5 d15 3 @ 1.10 log @*: Revision bumps for ncurses 6.5 overhaul. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2024/05/06 08:33:50 jperkin Exp $ d4 1 a4 1 PKGREVISION= 4 @ 1.9 log @*: Remove long-obsolete USE_NCURSES references. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2024/05/06 08:27:50 jperkin Exp $ d4 1 a4 1 PKGREVISION= 3 @ 1.8 log @*: Switch packages to combined ncurses package. CURSES_TYPE=ncursesw is no longer valid, update matches to use ncurses. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2023/11/08 13:18:44 wiz Exp $ a16 1 USE_NCURSES= yes #NCURSES_MOUSE_VERSION @ 1.7 log @*: recursive bump for icu 74.1 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2023/10/24 22:08:44 wiz Exp $ d21 1 a21 1 RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib d33 1 a33 1 .include "../../devel/ncursesw/buildlink3.mk" @ 1.6 log @*: bump for openssl 3 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2023/10/21 18:57:14 pin Exp $ d4 1 a4 1 PKGREVISION= 2 @ 1.5 log @devel/git-branchless: fix build with new libgit2 Switch to vendored libgit2 to avoid mismatches. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2023/08/30 08:30:17 pin Exp $ d4 1 a4 1 PKGREVISION= 1 @ 1.4 log @devel/git-branchless: update to 0.8.0 v0.8.0: build: delete git-branchless-testing crate The git-branchless-lib crate has a dev-dependency on git-branchless-testing, and git-branchless-testing has a dependency on git-branchless-lib, inducing a circular dependency that means they can't be published to crates.io. This commit collapses them into the same crate again to resolve this circular dependency. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2023/04/19 08:09:41 adam Exp $ d4 1 a20 1 RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libgit2}/lib a31 1 .include "../../devel/libgit2/buildlink3.mk" @ 1.3 log @revbump after textproc/icu update @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2023/03/17 21:20:59 pin Exp $ d3 1 a3 2 DISTNAME= git-branchless-0.7.1 PKGREVISION= 1 d24 3 @ 1.2 log @devel/git-branchless: update to 0.7.1 [0.7.1] - 2023-03-13 Added - (#830) Added `git branchless install-man-pages` command to generate and install man-pages. Fixed - (#844) Fixed build for NetBSD. [0.7.0] - 2023-03-01 Added - (#646) `git amend` now supports a `--reparent` option to adjust the contents of a commit while keeping the children commits exactly the same. - (#686) `git branchless init` will now populate the internal commit graph structure, rather than waiting for the first invocation of a `git branchless` subcommand. - (#725) Added `siblings()` revset function to determine the siblings of a given commit. - (#725) Added an `-I`/`--insert` option to `git record` to insert the new commit before all of the current commit's children. - (#763) Added a `-d`/`--detach` option to `git branchless switch` to switch to to a branch without checking it out. - (#766) Added a `git test fix` subcommand to apply formatters/linters/etc. to a set of commits. - (#777) Added the `--search` option to `git test run` to search a set of commits using linear or binary search for the first commit(s) which cause the tests to fail. - (#777) `git test run` now aborts the overall test run when a test returns exit code `127`. - (#777) `git test run` now sets the `BRANCHLESS_TEST_COMMIT` and `BRANCHLESS_TEST_COMMAND` environment variables when running the test command. - (#785) Added `tests.passed()`, `tests.failed()`, and `tests.fixable()` revset functions, whose results are populated by `git test`. - (#790) Added the `--reverse` option to `git smartlog`. Changed - (#730) BREAKING: The default revset for `git reword` is now `stack() | @@` instead of `@@`, to simultaneously reword all commits in the current stack. - (#763) BREAKING: `git branchless switch` no longer implicitly opens the interactive commit selector when no target is provided. You must explicitly pass `-i`/`--interactive` to do so. - (#801) BREAKING: The parameter to `git record` has been renamed from `-b`/`--branch` to `-c`/`--create`. - (#685) `git submit` now colorizes the names of the affected branches. - (#763) Running `git branchless switch` with no arguments will switch to the branch associate with the current commit, if there is exactly one such branch and the `branchless.navigation.autoSwitchBranches` configuration variable is set to `true`. - (#791) The name for the temporary file created by `git reword` is now of the form `COMMIT_EDITMSG-*.txt`, which your editor can use to detect it as a Git commit message file. - (#811) The styling for `git test` progress and output has been changed. Fixed - (#646) Adjusted messaging during merge conflicts with `git move --in-memory` to be more accurate. - (#647) `git test run` now recovers from previously-failed tests instead of failing indefinitely in future runs. - (#670) `git submit` no longer force-pushes the current branch in the circumstance that all branches are currently up-to-date. - (#688) `git amend` now respects the `--merge` option. - (#722) `git reword` now supports invoking editors with spaces in their names. - (#724) `git branchless init` now installs a `post-applypatch` hook, for users of `git am`. - (#742) `git branchless init` now respects a leading `~` in the `core.hooksPath` configuration variable. - (#743) `git sync`, etc. now correctly clean up remote branch information for branches which have been merged upstream. Previously, the remote branch information would be left behind, which would cause future branches with the same names to incorrectly become associated with the old remote branch. - (#764) `git sync` will no longer attempt to resolve merge conflicts unless you pass `--merge`. Previously, this could happen when attempting to sync merge commits. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2023/01/12 12:51:30 pin Exp $ d4 1 @ 1.1 log @devel/git-branchless: import package git-branchless is a suite of tools which enhances Git in several ways. It makes Git easier to use, both for novices and for power users. Examples: - git undo: a general-purpose undo command. - The smartlog: a convenient visualization tool. - git restack: to repair broken commit graphs. - Speculative merges: to avoid being caught off-guard by merge conflicts. - Patch-stack workflows: strong support for patch-stack workflows as used by the Linux and Git projects, as well as at many large tech companies. - Prototyping and experimenting workflows: strong support for prototyping and experimental work via divergent development. - git sync: to rebase all local commit stacks and branches without having to check them out first. - git move: The ability to move subtrees rather than sticks while cleaning up old branches, not touching the working copy, etc. - Anonymous branching: reduces the overhead of branching for experimental work. - In-memory operations: to modify the commit graph without having to check out the commits in question. - git next/prev: to quickly jump between commits and branches in a stack. - git sw -i/--interactive: to interactively select a commit to switch to. It provides faster operations for large repositories and monorepos, particularly at large tech companies. @ text @d1 1 a1 1 # $NetBSD$ d3 1 a3 1 DISTNAME= git-branchless-0.6.0 d11 1 a11 1 LICENSE= gnu-gpl-v2 @