9192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kiril Videlov	9dde8e7f7e	Merge pull request #4995 from gitbutlerapp/Use-new-checkout_combined_trees-in-upstream-integration ... Use the new checkout_combined_trees in upstream integration	2024-09-30 11:36:28 +02:00
Kiril Videlov	9910347528	Merge pull request #4994 from gitbutlerapp/Better-test-undo-commit-logic ... Add more tests to undo commit	2024-09-30 11:36:13 +02:00
Caleb Owens	dc45ab2aac	Use the new checkout_combined_trees in upstream integration	2024-09-30 02:01:11 +02:00
Caleb Owens	c3f6db382a	Add more tests to undo commit	2024-09-30 01:53:21 +02:00
Caleb Owens	7422110a6d	Merge pull request #4993 from gitbutlerapp/fix-create-wd-tree ... Use new git2 implementation	2024-09-30 00:12:17 +02:00
Caleb Owens	87663bea2d	Remove instances where add_all was used to get a tree of the current working directory	2024-09-29 23:39:23 +02:00
Caleb Owens	06af1c5fe9	Ensure that the index indeed remains unchanged	2024-09-29 23:23:50 +02:00
Caleb Owens	102b941d3e	Use new git2 implementation	2024-09-29 23:18:07 +02:00
Caleb Owens	d486308743	Merge pull request #4987 from gitbutlerapp/Reorder-commits-with-tests ... Add tests for reordering commits	2024-09-29 20:30:25 +02:00
Caleb Owens	47a4fc03c7	Update testing framework	2024-09-29 20:23:23 +02:00
Caleb Owens	be1fc2cf7e	Checkout trees after reordering (and make generic function for it)	2024-09-28 18:46:41 +02:00
Caleb Owens	947a9c7ff1	Fix branch.tree properties getting set to conflicted trees.	2024-09-28 18:45:11 +02:00
Caleb Owens	7f348d8a6d	Add tests for reordering commits	2024-09-28 17:50:32 +02:00
Nico Domino	216fca1cec	fix: simplify crates/package.json setup (#4986)	2024-09-28 15:29:48 +00:00
Nico Domino	d10bbcf515	feat: new stacking ui commit lines (#4972) ... Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>	2024-09-28 16:59:29 +02:00
Nico Domino	8b84f46df1	fix: add crates to pnpm-workspace to avoid Vercel CI (#4855)	2024-09-28 12:19:25 +02:00
Esteban Vega	4b9421a851	Merge pull request #4985 from gitbutlerapp/fix-base-branch-blank-page	2024-09-28 11:15:28 +02:00
estib	0f6a78e1b6	fix: Test for integrateUpstreamModal being undefined ... Don't try to read a property from the integration modal if it's undefined	2024-09-28 11:00:33 +02:00
Sebastian Thiel	adf43a59dc	Merge pull request #4984 from navtoj/Branch-Search-Hidden-Input ... fix: Branch Search Hidden Input	2024-09-27 15:41:05 +02:00
Navtoj Chahal	26b99e217e	Disable Hidden Input Interaction	2024-09-26 19:39:02 -07:00
Caleb Owens	01584fcfa9	Merge pull request #4981 from gitbutlerapp/rebase-tests ... Add helper function for matching trees, and start testing rebasing.	2024-09-26 15:25:40 +02:00
Caleb Owens	31242dbe2b	Add helper function for matching trees, and start testing rebasing. ... Basic rebasing tests	2024-09-26 14:42:14 +02:00
Caleb Owens	201aa55f12	Merge pull request #4980 from gitbutlerapp/Merging-commits ... Fix merge commit unconflicted state	2024-09-26 13:24:16 +02:00
Caleb Owens	8402b78e64	Merge pull request #4802 from JReinhold/storybook-8-3 ... UI: Upgrade to Storybook `8.3.0-beta.0`, add Vitest to UI package	2024-09-26 00:49:27 +02:00
Caleb Owens	dfb8eef044	Align changes with formatting; install browser deps	2024-09-26 00:36:46 +02:00
Caleb Owens	a0ed2bb3c8	Add playwright install as a test prerequisite	2024-09-26 00:27:47 +02:00
Caleb Owens	3c4cda739f	Update imports in relation to the 8.3 release	2024-09-26 00:24:21 +02:00
Caleb Owens	46fa53a878	Fix merge commit unconflicted state ... more tests	2024-09-25 23:37:37 +02:00
Caleb Owens	50086f0d84	Merge pull request #4973 from gitbutlerapp/Testing-rebase ... Add tests for resolving indexes	2024-09-25 15:25:58 +02:00
Caleb Owens	9cbebba5cf	Fix testcase for merge_vbranch_upstream_clean_rebase	2024-09-25 15:15:29 +02:00
Caleb Owens	b76baaf106	Merge	2024-09-25 13:06:06 +02:00
Caleb Owens	a0359486ad	Remove unrequired utils package ... * Ref https://github.com/storybookjs/storybook/pull/29008	2024-09-25 00:17:59 +02:00
Caleb Owens	2793bc4f13	Bump to release versions	2024-09-25 00:17:45 +02:00
Jeppe Reinhold	f27050018a	Upgrade to Storybook 8.3.0-beta.0, introduce VItest testing to UI package	2024-09-25 00:09:06 +02:00
Esteban Vega	598d60fbed	Merge pull request #4971 from gitbutlerapp/make-select-generic	2024-09-24 20:06:00 +02:00
Caleb Owens	8a84753e92	Merge branch 'master' into Testing-rebase	2024-09-24 20:00:38 +02:00
Caleb Owens	f74f2dcf26	More tests!	2024-09-24 19:52:21 +02:00
Kiril Videlov	86460fb675	Merge pull request #4964 from Byron/commit-with-headers ... `gitoxide` for commit with headers	2024-09-24 18:47:29 +02:00
Caleb Owens	bbbf81c4c1	Start to introduce index resolution tests	2024-09-24 17:01:38 +02:00
Caleb Owens	9802afe8bf	Merge pull request #4968 from gitbutlerapp/Refactor-rebase.rs ... Refactor some of rebase.rs	2024-09-24 17:00:10 +02:00
Esteban Vega	60c33f135e	Merge pull request #4970 from gitbutlerapp/clean-up-update-base-button ... clean-up: Remove unnecessary function declaration	2024-09-24 16:55:12 +02:00
Nico Domino	a7325e4d2d	fix: log and show toast (#4965)	2024-09-24 16:03:02 +02:00
Sebastian Thiel	0e63323456	remove commit-buffer as it's not needed anymore for dealing with headers.	2024-09-24 15:57:58 +02:00
Sebastian Thiel	fe7d5d92e7	add crate to keep gitoxide conversions to prevent duplication	2024-09-24 15:54:07 +02:00
estib	0f7b9f4d9c	Make the Select component generic ... Auto-detect the type of the value the select options can have	2024-09-24 15:43:46 +02:00
estib	9f6672b4e3	clean-up: Remove unnecessary function declaration	2024-09-24 14:19:50 +02:00
Esteban Vega	3bed869ded	Merge pull request #4963 from gitbutlerapp/factor-out-integrate-upstream-modal ... IntegrateUpstreamModal: Factor out the modal	2024-09-24 13:52:14 +02:00
estib	adc6357a80	Use the exposed state of the integrate upstream modal ... Export the state of whether the modal is open or not. Use it in the base branch page and the update base button.	2024-09-24 13:37:58 +02:00
estib	6ce77554fe	Modal: Expose the open or closed state ... Expose the state of whether the modal is open or not. [Some more info about this pattern.](https://github.com/sveltejs/svelte/issues/11974#issuecomment-2157837477)	2024-09-24 13:36:25 +02:00
Caleb Owens	a395dab091	Refactor some of rebase.rs	2024-09-24 13:20:02 +02:00