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
estib
9834627a20
Base: Propagate the conflicting status to the commits
2024-09-25 14:34:10 +02:00
estib
1368d87ed0
Base branch divergence resolution
...
Allow the user to choose how to resolve the base-branch divergence
2024-09-25 14:05:04 +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
estib
2091025227
Resolve upstream integration
...
Add a method to determine which should be the new base branch target commit ID based on what resolution approach is selected
2024-09-24 17:16:26 +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
e4cd357b8a
BaseBranch: Handle the button actions correctly
...
Depending on which action the user chooses, and whether they've set certain flags, act accordingly
2024-09-24 15:18:47 +02:00
estib
9f6672b4e3
clean-up: Remove unnecessary function declaration
2024-09-24 14:19:50 +02:00
estib
78d40a7493
BaseBranch: Don't be scary when pushing
...
Only display the warnings and confirmation modals when actual changes can get lost (resting to local or remote).
Otherwise, display less scary notifications and let the user push if needed
Merge remote-tracking branch 'origin/master' into base-branch-improvements
2024-09-24 14:06:49 +02:00
estib
9060a4287c
Ability to push the base branch
...
If needed, the base branch can be pushed or force pushed
2024-09-24 14:06:05 +02:00
estib
2be4aaac2d
Display the divergent state in the app
...
If the local target has diverged from the remote target, display that to the user as a warning
Only show either the divergence warning or upstream count
BaseBranch: Use runes
BaseBranch: Display the branch graph
In order to make it a bit clearer what the divergence state of the base branch is. reuse the line graphs to display it
BaseBranch divergence: Add a confirmation modal
2024-09-24 14:06:03 +02:00
estib
19acb8f22c
Array utils: group items by condition
2024-09-24 14:02:32 +02:00
estib
3a2cf73bcd
BaseBranch: Determine whether the base diverged
...
Determine whether the local target has diverged from the remote,
and return some information about that
2024-09-24 13:57:22 +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
Sebastian Thiel
d16656816d
Use gix to create signed commits with multiple headers.
2024-09-24 13:02:34 +02:00
Caleb Owens
20fa6cb6b6
Merge pull request #4967 from gitbutlerapp/Update-shell-scripts-for-dinosaurs-who-are-affraid-of-pnpm
...
Update shell scripts for dinosaurs who are affraid of pnpm
2024-09-24 12:50:16 +02:00
Caleb Owens
1b6945c236
Update shell scripts for dinosaurs who are affraid of pnpm
2024-09-24 12:41:42 +02:00
Caleb Owens
7c9401dd49
Merge pull request #4781 from gitbutlerapp/Fix-snapshot-details-transformer
...
Fix snapshot details transformer
2024-09-24 12:34:08 +02:00
Caleb Owens
2d52e3737f
Merge pull request #4959 from gitbutlerapp/sc-patch-stacks-2
...
Add basic views into stacks
2024-09-24 12:07:22 +02:00
Caleb Owens
e5115aa559
*throws corkscrew over sholder*
2024-09-24 12:05:36 +02:00
Sebastian Thiel
ada4b17c47
Make sure test doesn't fail if the default branch isn't master.
...
Ideally repository creation is standardized to avoid these issues,
but for now this is just the minimal fix to make the test suite
work for me.
2024-09-24 11:08:10 +02:00
Sebastian Thiel
9f6c01c5ab
make tests work under more conditions
...
Currently tests rely to be run globally so `branch-actions` can set
the required feature flags.
Now more crates that need it will set it so that their tests can be
run individually.
2024-09-24 11:01:13 +02:00
estib
536dfac6e4
IntegrateUpstreamModal: Factor out the modal
...
Factor out the modal for upstream integration into a dedicated component so that it can be shared easily
2024-09-24 09:54:13 +02:00
Kiril Videlov
4c11a96456
Merge pull request #4962 from gitbutlerapp/Fix-state-for-file-selections-not-propagating
...
Fix state for file selections not propagating
2024-09-24 09:33:19 +02:00
Esteban Vega
8fc1e0d77f
Merge pull request #4928 from gitbutlerapp/fix-use-correct-branch-name
2024-09-24 00:36:47 +02:00
Caleb Owens
9c23e577ba
Constrain FilIdSelection API
2024-09-23 21:00:53 +02:00
