381 Commits

Author	SHA1	Message	Date
Sebastian Thiel	f43f8c1d2b	assure both applications enforce max-performance settings for gitoxide.	2024-08-07 20:21:56 +02:00
Caleb Owens	0b31743a2e	mergey merge	2024-08-05 11:43:10 +02:00
Caleb Owens	aec1bda197	stuff	2024-08-05 11:37:39 +02:00
Nico Domino	e5498665b4	feat: add WebdriverIO based E2E test setup (#4561)	2024-08-02 10:46:56 +00: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
Nico Domino	cda04e9b5b	feat: clone repo onboarding step (#4542) ... Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>	2024-08-01 16:54:49 +02:00
Sebastian Thiel	182381dd79	assure normalization will always provide valid ref-names, or fail. ... Otherwise, it's possible to run into `git2` errors, which are more 'indirect'.	2024-07-31 18:52:01 +02:00
Caleb Owens	d37dcefdf5	Merge pull request #4523 from gitbutlerapp/Boosting-my-contribution-score ... Boosting my contribution score	2024-07-29 11:18:58 +02:00
Caleb Owens	6f4a190464	project_repo -> ctx	2024-07-29 11:14:02 +02:00
Caleb Owens	21bad4f30f	repo -> repository	2024-07-29 11:13:25 +02:00
Nico Domino	45d340ef37	fix: nightly build (#4522)	2024-07-29 08:49:22 +00:00
Caleb Owens	f4569ff4da	Yes Kiril, I know its an abrv., but its consistent with what Byron started	2024-07-29 10:46:17 +02:00
Caleb Owens	366ccfecdf	Rename ProjectRepository to CommandContext	2024-07-29 10:43:18 +02:00
Mattias Granlund	974e60aefc	Fix branch reordering ... - move branches into their own div - make only one update request	2024-07-29 01:07:06 +01:00
Kiril Videlov	9d04c08528	add branch listing details api ... this allows us to paginate the expensive bit of the API, like getting the lines added / removed	2024-07-28 22:19:30 +02:00
Sebastian Thiel	39099ba41c	run the nightly cargo fmt with pnpm fmt ... This also optimizes imports/uses, which is done only occasionally.	2024-07-28 21:02:40 +02:00
Sebastian Thiel	9e236e3469	remove async except for in gitbutler-git ... The reason is that it's unclear if maybe it's there for a good reason, and I don't want to break the complex code in there.	2024-07-28 20:47:35 +02:00
Sebastian Thiel	7c371e5dd4	More tests to understand more about the current branch-listing. ... This also needs the ability to create commits. Also experiment with `async` tauri commands, but without actually making them `async` - nothing actually is so why pretend? Further, assure we get the correct author and committer which helps it pick up the overridden author information when creating a commit.	2024-07-28 17:12:23 +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
Kiril Videlov	baf754aa07	Merge pull request #4507 from Byron/stable-on-unix ... avoid nightly compiler on unix	2024-07-27 15:43:35 +02:00
Sebastian Thiel	ad3e15dae4	Avoid using nightly by default. ... Instead, use it only where needed, which at this time is Windows for some nightly-only access to file-descriptors.	2024-07-27 14:35:26 +02:00
Nico Domino	1ced81fd06	fix: cleanup repo organisation (#4503)	2024-07-27 13:29:32 +02:00
Kiril Videlov	c7a8ef99c8	branch listing - allow filtering ... fix matching	2024-07-26 15:00:08 +02:00
Kiril Videlov	b47530af3a	Merged origin/master into new branch list api	2024-07-25 19:29:26 +02:00
Nico Domino	bce53ba383	feat: move @gitbutler/cloud into monorepo (#4494)	2024-07-25 15:53:28 +00:00
Kiril Videlov	3afabc2a30	merge conflict fix	2024-07-25 16:34:18 +02:00
Caleb Owens	7a6c7472a4	Always overwrite local references	2024-07-25 15:49:22 +02:00
Caleb Owens	c1c5d88303	Specify the correct branch to be the upstream ... asdf	2024-07-25 15:11:07 +02:00
Kiril Videlov	187a3c22fe	create a tauri commant for the new branch listing	2024-07-24 22:51:14 +02:00
Sebastian Thiel	af4c70fbbc	propagate fetch-errors explicitly to prevent silent failures (#4389) ... However, some tuning might be desired to prevent showing anything if background-fetches fail, which might be desirable after all as they don't seem to run with modals enabled. Also perform minor refactors while at it.	2024-07-20 22:38:25 +02:00
Kiril Videlov	b7e2f60b89	remove references to virtual branch controller from event handler ... After recent refactors, this state is useless	2024-07-20 13:44:03 +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
Pavel Laptev	b888fbc834	normilize-branch-name-update (#4392) ... * refactor: Normalized branch name handling * Refactor: use only one normalize function (rust) * Deletion: unused `normalizeBranchName` function * Update lib.rs * Changed test to reflect new functionality --------- Co-authored-by: Caleb Owens <caleb@gitbutler.com>	2024-07-16 11:23:09 +02:00
Nico Domino	bc8d00bb88	fix: update wp.com csp to wildcard subdomain (#4397)	2024-07-16 08:35:27 +00:00
Nico Domino	879746c665	feat: add io.wp.com to img-src CSP for gravatar / auth0 fallback avatars (#4396)	2024-07-16 08:15:38 +00:00
Kiril Videlov	8ccd8d511e	Merge pull request #4349 from Byron/refactor ... refactor and PoC for worktree mutability handling	2024-07-15 23:02:01 +02:00
Mattias Granlund	6692acd261	Simplify SystemEditor readable	2024-07-15 14:34:55 +01: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
Sebastian Thiel	b3b87b34a5	reduce tauri state ... This is in preparation for making operations that access the filesystems less stateful, which in turn makes it less akward to identify writing methods with `&mut` lateron. This includes accepting that all we really need is a single directory to generate everything else we need on the fly. This simplifies commands. For good measure, this also simplifies imports of smaller crates that are involved.	2024-07-14 22:27:53 +02:00
Sebastian Thiel	4a7b63a56e	various refactors in main functions called during project load ... * use `ctx` as name instead of `project_repository` to make lines shorter and more readable. This could be done everywhere once the type-name changes as well. * Where possible, avoid using `&self` for `VirtualBranchActions` as there is no state. For now I avoided to remove its usage as field in the filesystem monitor. * Use a more modern way to use state in `tauri` commands. * Add the `Ext` suffix to what clearly is extension traits.	2024-07-14 21:32:55 +02:00
Sebastian Thiel	f48d0e2746	adapt to changes in gitbutler-branch crate	2024-07-14 21:32:55 +02:00
Sebastian Thiel	4805f6e7e7	adapt to changes in gitbutler-branch-actions	2024-07-14 21:32:55 +02:00
Sebastian Thiel	6fb6201ab9	assure docs can be built without warnings by default. ... It's a good way to review import paths and the public API.	2024-07-14 21:32:49 +02:00
Sebastian Thiel	eaa18da9d0	Make the ProjectSelector multi-window aware ... That way it will not allow to open a project if it's known to be open already.	2024-07-12 15:19:09 +02:00
Sebastian Thiel	38f800d877	assure the multi-window lock actually works ... This includes the UI is responding to issues.	2024-07-12 15:19:09 +02:00
Sebastian Thiel	24b8bdaa86	Open new existing projects with Alt + click in project popup. ... This is intentionally non-obvious for now while it's new.	2024-07-12 15:19:09 +02:00
Sebastian Thiel	c310942b12	keep track of state per window ... This allows multiple application windows to be opened and managed.	2024-07-12 15:19:09 +02:00
Sebastian Thiel	ccd6a6fe0d	let UI trigger necessary updates on addition and removal	2024-07-12 15:19:09 +02:00
Sebastian Thiel	00303704f4	add project-lock to generalized state ... This means the current watcher also includes a file-lock for the current project. Later this can be generalized to be per-window.	2024-07-12 15:19:09 +02:00
Sebastian Thiel	4d2a153aed	Use extractors for project-commands ... That way, it's clearer what facilities or global state are used when invoking a particular command.	2024-07-12 15:19:09 +02:00
Kiril Videlov	d9d20d20e9	fixes a regression created during refactoring	2024-07-10 17:23:07 +02:00
Kiril Videlov	87f956d871	move ReferenceName tagged string to gitbutler-reference crate ... gitbutler-reference is where ReferenceName belongs. There are other thing in this crate that are not nice, but let's clean those up!	2024-07-10 16:48:59 +02:00
Nico Domino	43f60f94c8	feat: extract svelte build into own GHA job (#4321)	2024-07-10 13:45:18 +00: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
Kiril Videlov	ae6dc38ac7	rename virtual branches controller to actions	2024-07-10 12:11:36 +02:00
Kiril Videlov	a06570deb6	make the virtual branches controller stateless	2024-07-10 12:07:11 +02:00
Sebastian Thiel	0b735b58f3	avoid proxying author-images in favor to letting the frontend do the caching (#4007) ... The frontend should be better at this due to being a browser engine, which can naturally handle slow network links and firewalls. Caching should also be better and more consistent as cache-related headers are respected. This should speed up display times of new branches significantly, ideally without blocking the UI at all.	2024-07-09 21:24:23 +02:00
Caleb Owens	9b59764db3	Split branch creation and deletion into their own home	2024-07-09 16:47:24 +02:00
Kiril Videlov	45d4d7c6e1	remove unused deps	2024-07-09 16:00:45 +02:00
Kiril Videlov	cdec47154d	remove references to gitbutler-core	2024-07-09 15:56:57 +02:00
Kiril Videlov	c95c977ce2	move windows module to tauri ... Does this even do anything? Seems like dead code...	2024-07-09 15:44:58 +02:00
Kiril Videlov	00354771b7	move ReferenceName type to the reference crate	2024-07-09 14:53:36 +02:00
Kiril Videlov	db9d29b467	Rename ProjectRepo to ProjectRepository ... This is casue some ppl dont like abbrevs	2024-07-09 13:45:04 +02:00
Kiril Videlov	b856ebf6d3	Merge pull request #4302 from gitbutlerapp/extract-more-things-out-of-core ... extract more things out of core	2024-07-09 13:33:27 +02:00
Kiril Videlov	164ca5ed85	Merge pull request #4255 from Byron/log-retention ... better logs	2024-07-09 13:28:40 +02:00
Kiril Videlov	3be7d600e0	move fs and storage intor separate crates	2024-07-09 12:54:08 +02:00
Kiril Videlov	55b8a0357b	move id module to its own crate	2024-07-09 12:39:18 +02:00
Kiril Videlov	25ec331791	move secret module out of core into own crate	2024-07-09 12:11:12 +02:00
Kiril Videlov	989f27a0d6	move error module to it's own crate	2024-07-09 11:13:39 +02:00
Sebastian Thiel	bb880cf8a6	specifically remove log files with old name ... This also assures that previously spilled secrets will be removed.	2024-07-09 11:10:21 +02:00
Sebastian Thiel	5f192d0e77	consistent extension for .log files should help in reading them. ... This might particularly be true on Windows. Note that we don't call them `txt` to make opening them with a specialized program easier.	2024-07-09 11:03:31 +02:00
Sebastian Thiel	b1b04adf56	assure not too many log files are retained. ... Previously, despite `max_log_files()` configured, it would still retain more than that, and effectively never delete any as that would only happen on log-rotation. Now we do it ourselves just once.	2024-07-09 10:53:16 +02:00
Kiril Videlov	de200c8e20	move reference module from core to its own crate	2024-07-09 01:14:28 +02:00
Kiril Videlov	8043f0dd4e	remove unused keys module	2024-07-09 00:26:27 +02:00
Kiril Videlov	acee9ba5ab	move branch related modules to separate crate ... Unfortunatelly diff and branch types form a cyclical dependency via the "HunkLock" type. This will have to be refactored as a followup	2024-07-09 00:10:55 +02:00
Kiril Videlov	0c9c781bd5	Renaming crate gitbutler-branch to gitbutler-virtual ... This is more descriptive to what logic lives inside. Further, this allows for splitting up the just branch bits in a separate crate (which is currently in gitbutler-core)	2024-07-08 20:56:00 +02:00
Kiril Videlov	41ec6da226	move askpass module to repository where it is being used	2024-07-08 19:45:35 +02:00
Kiril Videlov	83a1d4a1e5	extract user as its own crate out of core	2024-07-08 18:58:29 +02:00
Kiril Videlov	f042854b1c	combine the assets proxying implementaiton in one file ... Now it's only used in one place	2024-07-08 18:23:51 +02:00
Kiril Videlov	e93896621f	move project module in a separate gitbutler-project crate	2024-07-08 15:33:26 +02:00
Kiril Videlov	f7094fcdff	move config module to a separate gitbutler-config crate	2024-07-08 14:49:45 +02:00
Kiril Videlov	a049711472	separate sending zipped logs functionality into gitbutler-feedback crate	2024-07-08 13:52:22 +02:00
Kiril Videlov	e258710502	move ProjectRepo into its own crate ... This type currently acts more or less like a command context that lives for the duration of the request. Regardless of if we wanna keep this pattern or not, separating it out helps us split up core	2024-07-08 13:23:03 +02:00
Kiril Videlov	306ab0bea9	move legacy credentail helper to gitbutler-repo crate ... it's mostly used from there	2024-07-08 13:01:38 +02:00
Kiril Videlov	7ac2d3a619	move repository ext trait to gitbutler-repo crate	2024-07-08 12:21:01 +02:00
Kiril Videlov	a83a9a8ffc	remove useless stateful remotes controller ... The same stuff can be achievecd without hoarding state	2024-07-08 10:58:16 +02:00
Kiril Videlov	f9f8addb72	move repo related commands out of the project controller	2024-07-08 10:47:37 +02:00
Kiril Videlov	7c7143a570	create new module in tauri for repo related functions ... moving out of project	2024-07-08 10:36:06 +02:00
Kiril Videlov	f92df0cde7	move RepoActions to gitbutler-repo crate	2024-07-08 00:45:04 +02:00
Kiril Videlov	018e550560	move remote_branches function from RepoActions to RepositoryExt	2024-07-07 23:33:58 +02:00
Kiril Videlov	66e8e8b91b	remove useless indirection when getting repo head	2024-07-07 23:24:45 +02:00
Kiril Videlov	c62c43ed6c	remove useless indirection when getting index size	2024-07-07 23:22:58 +02:00
Kiril Videlov	6dcbb8bddb	move conflicts module to branches crate	2024-07-07 22:58:48 +02:00
Kiril Videlov	ca2ffaac68	separate complex actions on Project repo in a separate trait	2024-07-07 22:28:27 +02:00
Kiril Videlov	143b3252a7	rename Repository type to ProjectRepo ... Less misleading this way..	2024-07-07 22:09:45 +02:00
Kiril Videlov	a7aa9b0e10	move remote module to the branch crate	2024-07-07 20:48:12 +02:00
Kiril Videlov	3d0455f12b	move virtual branch files impl our of core	2024-07-07 20:35:26 +02:00
Kiril Videlov	c36f67f148	move oplog to its own crate ... This protects us from cyclic dependencies. Unfortunatelly as part of this, i had to introduce the imp Project as trait implementations since now Project is foreign	2024-07-07 20:00:01 +02:00
Kiril Videlov	9eaab28a48	move base branch implementation to branches crate	2024-07-07 16:29:24 +02:00
Kiril Videlov	948c89e8be	move virtual outside of core	2024-07-07 15:51:07 +02:00
Kiril Videlov	7d078de52f	start moving virtual_branches to separate crate ... We want to move towards having each functional domain in a separate crate. The main benefit of that for our project is that this will enforce a unidirectional dependency graph (i.e. no cycles). Starting off with virutal_branches - a lot of the implementation is still in core (i.e. virtual.rs), that will be moved in a separate PR. Furthermore, the virtual branches controller (as well as virtual.rs) contain functions not directly related to branches (e.g. commit reordering etc). That will be furthe separate in a crate.	2024-07-07 13:32:35 +02:00
Kiril Videlov	819b327973	virtual branches controller - remove state dependency to credentials controller	2024-07-06 17:03:46 +02:00
Kiril Videlov	c777431363	remove the gitbutler generated key flow	2024-07-05 15:56:24 +02:00
Kiril Videlov	82dd580c27	move the updating of "last fetch timestamp" logic ... Removing the updating of project from the virtual branch controller - this is the only dependency between the two controllers and likely indicates that the "last fetched at" should live somewhere else. It will serve us well to not mutate the project state from the virtual branches domain	2024-07-04 16:34:53 +02:00
Kiril Videlov	fe7f1167bf	virtua branches controller - rm deps on project controller	2024-07-04 15:26:10 +02:00
Kiril Videlov	3dded08458	simplify virtual branches controller deps graph ... users controller is not a real dependency	2024-07-04 13:28:17 +02:00
Kiril Videlov	88da873128	Merge pull request #4184 from gitbutlerapp/bundle-as-RPM ... make RPM bundles	2024-07-02 15:54:42 +02:00
Caleb Owens	ac4f3b926c	Merge remote-tracking branch 'origin/master' into ndom91/create-gitbutler-ui-package	2024-07-02 15:31:00 +02:00
Kiril Videlov	23503afd25	merge stuff	2024-07-02 15:05:56 +02:00
Sebastian Thiel	b8da62c68b	assure SecretServices functions ... - inject secretService so it works when used directly - remove console logs - only remove a migrated secret (instead of removing it unconditionally) - in +template, await for good measure, which explains why the parent function is async In the backend: - prevent concurrency in method that stores secrets from the frontend as it's racy otherwise to type a secret quickly.	2024-07-02 13:17:45 +02:00
Caleb Owens	44e56ac370	Use turbo for production builds	2024-07-02 13:15:26 +02:00
Nico Domino	4fab3ec200	Merge branch 'master' into ndom91/create-gitbutler-ui-package	2024-07-02 10:04:46 +02:00
Sebastian Thiel	05506f49fa	migrate AI tokens from the git-configuration to the keystore. ... All AI related options are stored in the user-level git configuration file. Upon first access, they will be removed from there and placed into the keystore as part of the migration. The UI is provided with functions to store and save secrets which it will use specifically to interact with these keys. It's explicitly out of scope to *not* show the keys in plain-text anymore after entering them.	2024-07-02 10:02:46 +02:00
Sebastian Thiel	de00e4f049	support global secrets (without namespace for build types) and provide commands in tauri crate ... That way globals secrets can be used from the UI directly.	2024-07-02 10:02:46 +02:00
Sebastian Thiel	b08a9e8cb1	Prevent MacOS popups each startup on MacOS ... MacOS is the only known platform that exhibits this behaviour - if an app is recompiled, the hash of the binary is used to identify it towards the keychain. As this changes each time, the keychain will ask for permission, which is fair. However, it's also an impediment which leads to the implementation of a keystore that uses git credentials as backend. For this to work, the latest version of `gitoxide` is required for now.	2024-07-02 10:02:46 +02:00
Sebastian Thiel	fbfeba0637	auto-delete a user if its access token can't be found	2024-07-02 10:02:46 +02:00
Sebastian Thiel	ee5ff95649	Assure Sensitive fields can't be serialized ... This does not only mean that they cannot be written to disk, but also that extra work has to be done to serialize them over the wire. This is very much by design, as they can be in structs that are seemingly serializable and contain sensitive data, but they must never actually be serialized. For use in the UI, an extra type must be used that marks the secret differently, for instance by field name.	2024-07-02 10:02:45 +02:00
Sebastian Thiel	bc8f3b74c7	tauri specializes the secret-store depending on application type ... That way, there is no overlap in the technically global store, just like before when secrets were stored in plain text.	2024-07-02 10:02:45 +02:00
Kiril Videlov	4db2698cda	bump tauri minor version ... this allows us to bundle RPM packages!	2024-07-02 10:48:47 +03:00
Caleb Owens	82c3987d45	Unapply to real branches (#4025) ... * Don't return optional * Rename get_integration_commiter * Add a header to wip commit * Stuff * Unapply all branches * Reorder code * Fix one test * Name resolution * Fix two tests * Fix another! * wip * Fix so many tests * Fix unapply.rs tests * Fix selected for changes tests * Move unapplying logic to delete_branch method * Remove unused and kinda borked cherry_commit code * Fix the tests!!!!! * Make apply_branch private * Change handling of headers * Improve order integrity * Updated types and comments to convey more meaning	2024-07-01 14:13:52 +00:00
ndom91	d8a7f2bbdc	fix: cleanup build npm scripts	2024-06-28 11:34:44 +02:00
ndom91	091b45d5e9	feat: create separate component library subpackage	2024-06-26 18:01:09 +02:00
Kiril Videlov	4a0cf76b53	make RPM bundles	2024-06-25 20:44:11 +02:00
dependabot[bot]	b0579da1db	Bump tauri from 1.6.7 to 1.6.8 in the cargo group across 1 directory ... Bumps the cargo group with 1 update in the / directory: [tauri](https://github.com/tauri-apps/tauri). Updates `tauri` from 1.6.7 to 1.6.8 - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.7...tauri-v1.6.8) --- updated-dependencies: - dependency-name: tauri dependency-type: direct:production dependency-group: cargo ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-24 14:30:04 +00:00
dependabot[bot]	553674de3b	Bump the cargo group with 2 updates ... Bumps the cargo group with 2 updates: [tauri](https://github.com/tauri-apps/tauri) and [curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek). Updates `tauri` from 1.6.2 to 1.6.7 - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.2...tauri-v1.6.7) Updates `curve25519-dalek` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/dalek-cryptography/curve25519-dalek/releases) - [Commits](https://github.com/dalek-cryptography/curve25519-dalek/compare/curve25519-4.1.2...curve25519-4.1.3) --- updated-dependencies: - dependency-name: tauri dependency-type: direct:production dependency-group: cargo - dependency-name: curve25519-dalek dependency-type: indirect dependency-group: cargo ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-18 23:21:19 +00:00
Pavel Laptev	0dfb591ac4	Revert "Added hotkey and the accelerator to the top menu (#4097)" (#4099) ... This reverts commit e09810bfff.	2024-06-17 14:20:38 +02:00
Pavel Laptev	e09810bfff	Added hotkey and the accelerator to the top menu (#4097)	2024-06-17 12:46:04 +02:00
Caleb Owens	58ea9879ba	Add a shortcut and menu item to access settings ... Co-authored-by: Louis <h1ghbre4k3r@dev.bre4k3r.de>	2024-06-17 11:05:47 +02:00
Kiril Videlov	9c56a5f040	remove proxy core::Oid	2024-06-05 22:56:03 +02:00
Scott Chacon	b60a66452d	merge upstream	2024-06-05 10:17:03 +02:00
Scott Chacon	a6e5abb620	can check commit signing	2024-06-05 10:14:49 +02:00
Kiril Videlov	65a22691ee	Merge pull request #3958 from TheGB0077/vscodium-patch ... feat: Open with VS Code also opens VS Codium if available, partial fix for #3646	2024-06-04 16:28:55 +02:00
Kiril Videlov	802e3419bd	introduce a convinience GbConfig type	2024-06-04 15:35:29 +02:00
TheGB0077	848e33ac45	revert back to any	2024-06-04 04:27:51 -03:00
TheGB0077	21d59b5e05	logic simplified	2024-06-03 14:28:04 -03:00
Kiril Videlov	40cfc55309	support setting signCommits git config	2024-06-03 17:00:14 +02:00
Kiril Videlov	bc16fadcc5	move commit signing to git2 extension trait	2024-06-03 01:04:14 +02:00
TheGB0077	a77f3ad6e3	VSCodium basic setup	2024-06-02 14:53:37 -03:00
Kiril Videlov	e18684fcdb	remove the auto detect git flow ... It was complex, buggy and slow	2024-06-02 15:48:15 +02:00
dependabot[bot]	398558d063	Bump the rust-updates group with 17 updates ... Bumps the rust-updates group with 17 updates: | Package | From | To | | --- | --- | --- | | [serde](https://github.com/serde-rs/serde) | `1.0.199` | `1.0.203` | | [thiserror](https://github.com/dtolnay/thiserror) | `1.0.59` | `1.0.61` | | [tokio](https://github.com/tokio-rs/tokio) | `1.37.0` | `1.38.0` | | [toml](https://github.com/toml-rs/toml) | `0.8.12` | `0.8.13` | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.82` | `1.0.86` | | [backtrace](https://github.com/rust-lang/backtrace-rs) | `0.3.71` | `0.3.72` | | [itertools](https://github.com/rust-itertools/itertools) | `0.12.1` | `0.13.0` | | [serde_json](https://github.com/serde-rs/json) | `1.0.116` | `1.0.117` | | [open](https://github.com/Byron/open-rs) | `5.1.2` | `5.1.3` | | [tauri-build](https://github.com/tauri-apps/tauri) | `1.5.1` | `1.5.2` | | [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.30.11` | `0.30.12` | | [nix](https://github.com/nix-rust/nix) | `0.28.0` | `0.29.0` | | [tokio-util](https://github.com/tokio-rs/tokio) | `0.7.10` | `0.7.11` | | [parking_lot](https://github.com/Amanieu/parking_lot) | `0.12.1` | `0.12.3` | | [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) | `0.5.12` | `0.5.13` | | [mock_instant](https://github.com/museun/mock_instant) | `0.3.2` | `0.4.0` | | [rstest](https://github.com/la10736/rstest) | `0.18.2` | `0.20.0` | Updates `serde` from 1.0.199 to 1.0.203 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.199...v1.0.203) Updates `thiserror` from 1.0.59 to 1.0.61 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.59...1.0.61) Updates `tokio` from 1.37.0 to 1.38.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.37.0...tokio-1.38.0) Updates `toml` from 0.8.12 to 0.8.13 - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.12...toml-v0.8.13) Updates `anyhow` from 1.0.82 to 1.0.86 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.82...1.0.86) Updates `backtrace` from 0.3.71 to 0.3.72 - [Release notes](https://github.com/rust-lang/backtrace-rs/releases) - [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.71...0.3.72) Updates `itertools` from 0.12.1 to 0.13.0 - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0) Updates `serde_json` from 1.0.116 to 1.0.117 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.116...v1.0.117) Updates `open` from 5.1.2 to 5.1.3 - [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.1.2...v5.1.3) Updates `tauri-build` from 1.5.1 to 1.5.2 - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5.1...tauri-build-v1.5.2) Updates `sysinfo` from 0.30.11 to 0.30.12 - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/commits) Updates `nix` from 0.28.0 to 0.29.0 - [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md) - [Commits](https://github.com/nix-rust/nix/compare/v0.28.0...v0.29.0) Updates `tokio-util` from 0.7.10 to 0.7.11 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.10...tokio-util-0.7.11) Updates `parking_lot` from 0.12.1 to 0.12.3 - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](https://github.com/Amanieu/parking_lot/compare/0.12.1...0.12.3) Updates `crossbeam-channel` from 0.5.12 to 0.5.13 - [Release notes](https://github.com/crossbeam-rs/crossbeam/releases) - [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md) - [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.5.12...crossbeam-channel-0.5.13) Updates `mock_instant` from 0.3.2 to 0.4.0 - [Commits](https://github.com/museun/mock_instant/compare/v0.3.2...v0.4.0) Updates `rstest` from 0.18.2 to 0.20.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.18.2...v0.20.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: tokio 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 - dependency-name: anyhow 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: itertools 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: open dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: tauri-build dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: nix dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-updates - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: parking_lot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: crossbeam-channel dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-updates - dependency-name: mock_instant dependency-type: direct:production update-type: version-update:semver-minor 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-06-01 15:38:43 +00:00
Sebastian Thiel	83893a9db3	review error docs to fit the latest changes	2024-06-01 15:24:59 +02:00
Sebastian Thiel	567a077582	simplify core::errors and remove all the cruft	2024-06-01 14:37:41 +02:00
Sebastian Thiel	a10b19ed2c	reomve all thiserror based errors from controllers	2024-06-01 14:36:08 +02:00
Sebastian Thiel	e7c1d6033a	Remove all errors that don't trigger a custom code or context	2024-06-01 14:34:16 +02:00
Sebastian Thiel	20d84247e9	Prune Code to only what's used by the UI ... Also adjust the `Code` documentation to clarify this - otherwise we will have more and more variants and nobody actually cares. The frontend code is adjusted as well, as its `Code` counterpart contained unsused variants which are now removed.	2024-06-01 14:32:27 +02:00
Kiril Videlov	d164457299	update_base_branch returns unapplied branches list ... If merge conflicts caused branches to become unapplied, return them as a list	2024-06-01 13:11:53 +02:00
Caleb Owens	faa476875d	Replace &BranchId to BranchId	2024-05-29 11:07:36 +02:00
Caleb Owens	0db12b5115	Don't pass references to project_id	2024-05-29 10:47:11 +02:00
Caleb Owens	c5d841a417	Tweaks to remotes code	2024-05-29 09:52:03 +02:00