118 Commits

Author	SHA1	Message	Date
Kiril Videlov	7ec59f8489	extract the Branch types to crate gitbutler-stack	2024-10-08 15:27:16 +02:00
Kiril Videlov	d78ebbe176	rename crate gitbutler-stack to gitbutler-stack-api ... This is needed to free up the name gitbutler-stack	2024-10-08 14:53:23 +02:00
dependabot[bot]	69752599be	Bump the rust-updates group across 1 directory with 13 updates ... Bumps the rust-updates group with 13 updates in the / directory: | Package | From | To | | --- | --- | --- | | [serde](https://github.com/serde-rs/serde) | `1.0.209` | `1.0.210` | | [thiserror](https://github.com/dtolnay/thiserror) | `1.0.63` | `1.0.64` | | [backtrace](https://github.com/rust-lang/backtrace-rs) | `0.3.73` | `0.3.74` | | [once_cell](https://github.com/matklad/once_cell) | `1.19.0` | `1.20.1` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.7` | `0.12.8` | | [serde_json](https://github.com/serde-rs/json) | `1.0.127` | `1.0.128` | | [pretty_assertions](https://github.com/rust-pretty-assertions/rust-pretty-assertions) | `1.4.0` | `1.4.1` | | [tempfile](https://github.com/Stebalien/tempfile) | `3.12.0` | `3.13.0` | | [tauri-build](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.5.5` | | [tokio-util](https://github.com/tokio-rs/tokio) | `0.7.11` | `0.7.12` | | [rstest](https://github.com/la10736/rstest) | `0.22.0` | `0.23.0` | | [clap](https://github.com/clap-rs/clap) | `4.5.16` | `4.5.19` | | [regex](https://github.com/rust-lang/regex) | `1.10.6` | `1.11.0` | Updates `serde` from 1.0.209 to 1.0.210 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.209...v1.0.210) Updates `thiserror` from 1.0.63 to 1.0.64 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.63...1.0.64) Updates `backtrace` from 0.3.73 to 0.3.74 - [Release notes](https://github.com/rust-lang/backtrace-rs/releases) - [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.73...0.3.74) Updates `once_cell` from 1.19.0 to 1.20.1 - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.19.0...v1.20.1) Updates `reqwest` from 0.12.7 to 0.12.8 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.7...v0.12.8) Updates `serde_json` from 1.0.127 to 1.0.128 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/1.0.127...1.0.128) Updates `pretty_assertions` from 1.4.0 to 1.4.1 - [Release notes](https://github.com/rust-pretty-assertions/rust-pretty-assertions/releases) - [Changelog](https://github.com/rust-pretty-assertions/rust-pretty-assertions/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-pretty-assertions/rust-pretty-assertions/compare/v1.4.0...v1.4.1) Updates `tempfile` from 3.12.0 to 3.13.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.12.0...v3.13.0) Updates `tauri-build` from 1.5.4 to 1.5.5 - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5.4...tauri-build-v1.5.5) Updates `tokio-util` from 0.7.11 to 0.7.12 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.11...tokio-util-0.7.12) Updates `rstest` from 0.22.0 to 0.23.0 - [Release notes](https://github.com/la10736/rstest/releases) - [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md) - [Commits](https://github.com/la10736/rstest/compare/v0.22.0...v0.23.0) Updates `clap` from 4.5.16 to 4.5.19 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.16...clap_complete-v4.5.19) Updates `regex` from 1.10.6 to 1.11.0 - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.10.6...1.11.0) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: backtrace dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: pretty_assertions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: tauri-build dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: rstest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-02 22:37:53 +00:00
Kiril Videlov	f6ec80d8ce	Adds a trait Stack with an implementation for Branch ... This provides a well defined interface for interacting with Stacks. It is implemented for gitbutler_branch::Branch, and it is specifically meant to operate on and update the `heads` field of Branch This facilitates creating, updating, removing, pushing and listing of "stacked branches" within the Stack (formerly the virtual branch).	2024-09-29 19:26:39 +02:00
Kiril Videlov	a2aafd919b	Introduce PatchReference and a heads field on Branch ... - The PatchReference type represents a "reference" that is entirely managed by GitButler. It can either point to a commit or a GitButler change (which itself points to a commit) - The Branch type (as persisted in virtual_branches.toml) now has a `heads` fields with a list of PatchReferences. This list is not to be meant to be manipulated directly, but with the `Stack` trait	2024-09-28 12:34:29 +02:00
Caleb Owens	8a84753e92	Merge branch 'master' into Testing-rebase	2024-09-24 20:00:38 +02:00
Caleb Owens	bbbf81c4c1	Start to introduce index resolution tests	2024-09-24 17:01:38 +02:00
Sebastian Thiel	fe7d5d92e7	add crate to keep gitoxide conversions to prevent duplication	2024-09-24 15:54:07 +02:00
Kiril Videlov	57c3e8b5d2	Merge pull request #4900 from Byron/better-locking ... ignore lock-errors on filesystems that lack support	2024-09-16 10:22:51 +02:00
Sebastian Thiel	099ac50f5d	update gix to get tree-editing capabilities	2024-09-14 15:35:08 +02:00
Sebastian Thiel	6285d9177e	fix: ignore lock-failures on filesystems that don't support it (#4895) ... Just like `cargo` does.	2024-09-14 08:48:17 +02:00
dependabot[bot]	6aaf2d89ec	Bump the rust-updates group with 3 updates ... Bumps the rust-updates group with 3 updates: [tokio](https://github.com/tokio-rs/tokio), [sysinfo](https://github.com/GuillaumeGomez/sysinfo) and [rstest](https://github.com/la10736/rstest). Updates `tokio` from 1.39.3 to 1.40.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.39.3...tokio-1.40.0) Updates `sysinfo` from 0.31.3 to 0.31.4 - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.31.3...v0.31.4) Updates `rstest` from 0.21.0 to 0.22.0 - [Release notes](https://github.com/la10736/rstest/releases) - [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md) - [Commits](https://github.com/la10736/rstest/compare/v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: rstest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-01 15:57:33 +00:00
Sebastian Thiel	bd2c19db0b	Allow the bench profile to compile faster ... There we don't necessarily need every last bit of optimization like one would want in release profiles, but build performance is of the essence for developer productivity.	2024-08-28 11:10:04 +02:00
Caleb Owens	3fb5077c4a	Somethign somethign matchy matchy design	2024-08-27 13:05:27 +02:00
Sebastian Thiel	c2decbbdc7	Use the latest version of gix for performance improvements.	2024-08-27 12:17:52 +02:00
Sebastian Thiel	4ad8c0ed11	use latest gix to make merge-base available.	2024-08-26 19:34:21 +02:00
Sebastian Thiel	47916d8b41	use the latest gix from GitHub with latest improvements	2024-08-23 13:08:37 +02:00
Sebastian Thiel	e78ef9b115	enable max performance to be competitive in object database access. ... This is very relevant for tree-diffing performance, and more could be tuned here like pack-cache sizes and object cache sizes.	2024-08-21 19:28:12 +02:00
Sebastian Thiel	96e0d3e83f	add --trace to enable tracing ... This is useful to get simple performance metrics.	2024-08-21 19:23:42 +02:00
Sebastian Thiel	c58112f157	Use latest gix from main	2024-08-21 19:23:42 +02:00
Caleb Owens	7ab7731a31	Add edit mode actions ... More edit mode	2024-08-19 11:03:51 +02:00
Caleb Owens	c98421171e	Introduce edit mode ... asdf	2024-08-13 14:14:02 +02:00
Sebastian Thiel	0d1ac25ef4	Use the latest version of gix for sanitization support	2024-08-09 21:14:17 +02:00
Sebastian Thiel	de2989f352	Don't use gix built-in serialization as it will leave BString as sequence of numbers. ... Instead, we need it to be a string, even if lossy.	2024-08-09 13:12:36 +02:00
Sebastian Thiel	acbd42fce3	Revert "remove unnecessary BString-related serde functions." ... This reverts commit 3043f099b7. We actually need this - me removing it just means it wasn't properly documented and clarified in the type-system as to why this is needed.	2024-08-09 10:52:05 +02:00
Sebastian Thiel	4c76e2a6ee	Revert "Revert "Merge pull request #4652 from gitbutlerapp/git2-to-gix"" ... This reverts commit 88496e6219.	2024-08-09 10:30:52 +02:00
Kiril Videlov	88496e6219	Revert "Merge pull request #4652 from gitbutlerapp/git2-to-gix" ... This reverts commit ae8b05ae70, reversing changes made to 4d9b6a4a93.	2024-08-09 10:18:51 +02:00
Sebastian Thiel	6720e987fe	Use gix::refs::PartialName as even stronger guarantee for what's in there	2024-08-08 21:04:09 +02:00
Sebastian Thiel	f2a462f9b3	switch to latest gitoxide for updates supported the following changes	2024-08-08 20:53:10 +02:00
Sebastian Thiel	3043f099b7	remove unnecessary BString-related serde functions. ... They are supported when the respective bstring feature is used.	2024-08-08 17:25:18 +02:00
Sebastian Thiel	17850bd210	Use gix for branch listing	2024-08-07 20:21:29 +02:00
Sebastian Thiel	9476bf3b96	update gix to the latest version for gix-validate update (#4570)	2024-08-01 22:17:42 +02:00
dependabot[bot]	c9c4630087	Bump the rust-updates group across 1 directory with 8 updates ... Bumps the rust-updates group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [thiserror](https://github.com/dtolnay/thiserror) | `1.0.62` | `1.0.63` | | [tokio](https://github.com/tokio-rs/tokio) | `1.38.0` | `1.39.2` | | [console-subscriber](https://github.com/tokio-rs/console) | `0.3.0` | `0.4.0` | | [serde_json](https://github.com/serde-rs/json) | `1.0.120` | `1.0.121` | | [assert_cmd](https://github.com/assert-rs/assert_cmd) | `2.0.14` | `2.0.15` | | [clap](https://github.com/clap-rs/clap) | `4.5.9` | `4.5.13` | | [bstr](https://github.com/BurntSushi/bstr) | `1.9.1` | `1.10.0` | | [toml](https://github.com/toml-rs/toml) | `0.8.14` | `0.8.15` | Updates `thiserror` from 1.0.62 to 1.0.63 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.62...1.0.63) Updates `tokio` from 1.38.0 to 1.39.2 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.39.2) Updates `console-subscriber` from 0.3.0 to 0.4.0 - [Release notes](https://github.com/tokio-rs/console/releases) - [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml) - [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.3.0...console-subscriber-v0.4.0) Updates `serde_json` from 1.0.120 to 1.0.121 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.120...v1.0.121) Updates `assert_cmd` from 2.0.14 to 2.0.15 - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.14...v2.0.15) Updates `clap` from 4.5.9 to 4.5.13 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.9...v4.5.13) Updates `bstr` from 1.9.1 to 1.10.0 - [Commits](https://github.com/BurntSushi/bstr/compare/1.9.1...1.10.0) Updates `toml` from 0.8.14 to 0.8.15 - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.14...toml-v0.8.15) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: console-subscriber dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 19:45:06 +00:00
Sebastian Thiel	76d687b55c	Respect author-date for setting up completely static commmit graphs ... This updates to a yet-to-be-released version of `gix` to be able to leverage full local-time support thanks to the usage of `jiff`. This means we can now rely on the local `now()` that `gix` signatures come with, which naturally respect environment variables that help to make commits statically known. For the running Tauri application this won't have an effect as it won't inherit environment variables, but the CLI will be different in that regard.	2024-07-31 18:52:01 +02:00
Caleb Owens	2d61cae43a	Introduce operating modes	2024-07-29 13:19:38 +02:00
Sebastian Thiel	282519eca5	add ability to create add projects in CLI and create vbranches ... This allows actual GitButler setups and more complex tests, which are also added here.	2024-07-28 10:45:18 +02:00
Sebastian Thiel	1139918777	update gix to 0.64 ... It comes with various fixes and improvements, and the new APIs that we were already depending on using the `git` dependency.	2024-07-23 20:54:45 +02:00
Sebastian Thiel	2e3f261bd2	update gix to the latest version for its improved git.exe discovery on Windows ... Instead of hard-coding two known paths, it will dynamically discover the right location, handling different Windows install-locations automatically, using the very portable and easy-to-use environment variables.	2024-07-18 10:41:33 +02:00
Kiril Videlov	6101c5c66f	move hunk and diff code to a separate crate, out of the branch one	2024-07-17 20:16:48 +02:00
dependabot[bot]	cdafe5bc2c	Bump the rust-updates group across 1 directory with 8 updates ... Bumps the rust-updates group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [serde](https://github.com/serde-rs/serde) | `1.0.203` | `1.0.204` | | [thiserror](https://github.com/dtolnay/thiserror) | `1.0.61` | `1.0.62` | | [console-subscriber](https://github.com/tokio-rs/console) | `0.2.0` | `0.3.0` | | [open](https://github.com/Byron/open-rs) | `5.2.0` | `5.3.0` | | [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.30.12` | `0.30.13` | | [rstest](https://github.com/la10736/rstest) | `0.20.0` | `0.21.0` | | [clap](https://github.com/clap-rs/clap) | `4.5.8` | `4.5.9` | | [diffy](https://github.com/bmwill/diffy) | `0.3.0` | `0.4.0` | Updates `serde` from 1.0.203 to 1.0.204 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.203...v1.0.204) Updates `thiserror` from 1.0.61 to 1.0.62 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.61...1.0.62) Updates `console-subscriber` from 0.2.0 to 0.3.0 - [Release notes](https://github.com/tokio-rs/console/releases) - [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml) - [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.2.0...console-subscriber-v0.3.0) Updates `open` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/Byron/open-rs/releases) - [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md) - [Commits](https://github.com/Byron/open-rs/compare/v5.2.0...v5.3.0) Updates `sysinfo` from 0.30.12 to 0.30.13 - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/commits/v0.30.13) Updates `rstest` from 0.20.0 to 0.21.0 - [Release notes](https://github.com/la10736/rstest/releases) - [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md) - [Commits](https://github.com/la10736/rstest/compare/v0.20.0...v0.21.0) Updates `clap` from 4.5.8 to 4.5.9 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.8...v4.5.9) Updates `diffy` from 0.3.0 to 0.4.0 - [Changelog](https://github.com/bmwill/diffy/blob/master/CHANGELOG.md) - [Commits](https://github.com/bmwill/diffy/commits) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: console-subscriber dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: open dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: rstest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: diffy dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-16 15:22:10 +00:00
Sebastian Thiel	09ca2d0284	enforce in-process-synchronization during worktree updates and prolonged reads in oplog ... That way it's assured that reads and writes don't intersect, but assure we only hold such lock for the shortest amount of time for reads and and for the full duration of writes.	2024-07-15 14:21:15 +02:00
Kiril Videlov	e92fe44fa1	move branch state into the gitbutler-branch crate ... Further to the move - the VirtualBranchesExt trait creates a dependency towards gitbutler-project. The gitubler-branch crate doesn't have such dependency so i deemed it undesirable to introduce it just for a convinience method. (Separately added an extention in gitbutler-virtual-actions since it already depends on project and to create a smaller diff)	2024-07-10 16:18:34 +02:00
Kiril Videlov	c8658b9a23	rename gitbutler-virtual to gitbutler-branch-actions ... This is to establish a patter of which crates represent a higher level logic	2024-07-10 14:49:48 +02:00
Caleb Owens	9b59764db3	Split branch creation and deletion into their own home	2024-07-09 16:47:24 +02:00
Kiril Videlov	cdec47154d	remove references to gitbutler-core	2024-07-09 15:56:57 +02:00
Kiril Videlov	99d7b85343	move url module to a separate crate ... this code is awful - lets nuke it asap	2024-07-09 15:29:24 +02:00
Kiril Videlov	01f3e0f0c4	extract tagged string to its own crate	2024-07-09 14:57:43 +02:00
Kiril Videlov	a4d3680891	extract commit crate out of core	2024-07-09 13:19:49 +02:00
Kiril Videlov	9023382c78	move time module to it's own crate	2024-07-09 13:08:12 +02:00
Kiril Videlov	3be7d600e0	move fs and storage intor separate crates	2024-07-09 12:54:08 +02:00