Caleb Owens
39f9f50296
Float unconflicted files in edit mode
2024-10-09 11:21:51 +02:00
Nico Domino
b3e3ebdb34
fix: migrate Icon.svelte to svelte 5 syntax ( #4990 )
...
* fix: migrate Icon.svelte to svelte 5 syntax
* fix: prettier
2024-10-09 01:49:31 +02:00
Kiril Videlov
87a4c61b9f
Consistent setting of stack head updating the series
2024-10-08 22:25:19 +02:00
Kiril Videlov
915acd6afb
Fixes a bug when validating stack target commit
2024-10-08 22:24:34 +02:00
Kiril Videlov
1aa47d00f2
Merge pull request #5059 from gitbutlerapp/refactor-Branch-and-Stack
...
refactor Branch and Stack
2024-10-08 19:49:38 +02:00
Kiril Videlov
34ca1f4a65
Merge master into refactor Branch and Stack
2024-10-08 19:40:17 +02:00
Caleb Owens
12782d5229
Merge pull request #5000 from gitbutlerapp/pr-5000
...
FEARLESS REBASING
2024-10-08 16:49:51 +02:00
Kiril Videlov
cfafc8d7b5
Make all places that create Stack also initialize it
2024-10-08 16:43:42 +02:00
Kiril Videlov
48bbe13d56
Rename StackExt.new to create
2024-10-08 16:37:07 +02:00
Kiril Videlov
570c974544
Rename StackActions to StackExt
...
Closer to rust conventions
2024-10-08 16:32:18 +02:00
Kiril Videlov
f172855c61
Adds a new method to StackActions
2024-10-08 16:12:21 +02:00
Kiril Videlov
ce9b136185
Rename Stack constructor function to new_uninitialized
...
This describes it more accurately
2024-10-08 16:05:23 +02:00
Kiril Videlov
f6d8bbc663
remove unused type
2024-10-08 16:03:22 +02:00
Kiril Videlov
d05d962cf8
Rename Branch to Stack
2024-10-08 15:59:27 +02:00
Esteban Vega
72e981f8cc
pr details follow up ( #5054 )
...
* PR Details: CMD or Ctrl + Click opens the browser
* Segment: Optionally make it unfocusable
Control whethe the segment can be focused on tab, or not
* PR Details: Remove unused 'e' handler
* Borderless Textarea: Ability to autofocus
Optionally, autofocus the input field on mount
* PR Details: Update focus behavior
- Focus on the title input filed on mount
- Make the segments unfocusable
* design update
* Update PrDetailsModal.svelte
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-08 15:50:43 +02:00
Caleb Owens
99145f4aa4
Redo branch upstream integration
2024-10-08 15:49:58 +02:00
Kiril Videlov
9e9f3255a8
Remove some types out of the stack crate
...
Seems i can get away without adding it
2024-10-08 15:44:59 +02:00
Kiril Videlov
7ec59f8489
extract the Branch types to crate gitbutler-stack
2024-10-08 15:27:16 +02:00
Pranav2612000
1bb390a573
refactor: rename check_source_lock_to_ancestors to check_source_lock_to_commits
2024-10-08 18:30:22 +05:30
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
Kiril Videlov
0658920abc
Merge pull request #5057 from gitbutlerapp/Refactor-Branch-to-abstract-setting-and-getting-the-head-property
...
Refactor Branch to abstract setting and getting the `head` property
2024-10-08 13:21:31 +02:00
Kiril Videlov
5b7109e8ee
refactor(Branch): implement set_head() and make field private
...
This allows us to control the head setting and update the stack `heads` field accordingly
2024-10-08 12:21:57 +02:00
Kiril Videlov
cb2c0d458e
refactor(Branch): implement a head() method
...
Moving the access to head behind a method so that we can eventually migrate to the `heads` field
2024-10-08 12:23:38 +02:00
Caleb Owens
02307a5512
Merge pull request #5021 from gitbutlerapp/Test-and-refactor-branch-upstream-integration
...
Introduce merge_base_octopussy
2024-10-08 10:54:48 +02:00
Caleb Owens
8f9fd0cbe7
Extract branch_upstream_integration into it's own file
2024-10-07 18:02:21 +02:00
Caleb Owens
45fbb1af76
Remove old update_base_branch code
2024-10-07 17:46:28 +02:00
Caleb Owens
2f33d618d5
Remove succeeding rebase flag from the frontend
2024-10-07 17:31:08 +02:00
Caleb Owens
531672876f
Remove edit mode flag from backend
2024-10-07 17:08:32 +02:00
Caleb Owens
5feacea05f
Merge pull request #5053 from gitbutlerapp/Refactor-edit-mode
...
Use common primatives, and make sure conflicted trees are handled correctly
2024-10-07 17:04:43 +02:00
Caleb Owens
2cb1358ac0
Use common primatives, and make sure conflicted trees are handled correctly
2024-10-07 16:51:24 +02:00
Caleb Owens
0c362ae6df
Merge pull request #5052 from gitbutlerapp/Refactor-tree-updating
...
Extract tree updating into its own tested function
2024-10-07 16:28:55 +02:00
Caleb Owens
82406810f0
Extract tree updating into its own tested function
2024-10-07 16:10:34 +02:00
Esteban Vega
cb90ca5e7c
Merge pull request #5037 from gitbutlerapp/pr-details
...
PR details modal
2024-10-07 14:37:20 +02:00
Pavel Laptev
f6621ba4d5
copy update
2024-10-07 14:33:22 +02:00
estib
efcfe0954e
PrDetailsModal: Display the actualy body
...
- Display the actual body value
- Generate the message on `shift` + `cmd` + g
2024-10-07 14:14:38 +02:00
estib
455d67fb86
Prettier fixing
2024-10-07 14:07:20 +02:00
Pavel Laptev
5ec15fcf26
fixes
...
- return accidentally deleted code
- pr card layout and copy updated
2024-10-07 13:48:20 +02:00
Esteban Vega
4137b31a5c
Merge pull request #5051 from gitbutlerapp/enable-string-error-toasts
...
improvement: Allow for string error toasts
2024-10-07 13:36:00 +02:00
Pavel Laptev
afc270b561
copy update
2024-10-07 13:20:11 +02:00
Pavel Laptev
8cfee0328a
update PR tags
2024-10-07 13:10:35 +02:00
Pavel Laptev
d33da1c868
"Update" button update
...
- move the button position
- don't disable the "update" button if checks are loading
2024-10-07 12:34:12 +02:00
Pavel Laptev
54f7059aa6
update PR card design
2024-10-07 12:30:41 +02:00
estib
83738f35f6
improvement: Allow for string error toasts
...
Passing a string as the error to be displayed in the toast will display it as is
2024-10-07 12:18:42 +02:00
Pavel Laptev
96e9e7b3bb
added custom scrollbar component
2024-10-07 12:07:04 +02:00
Pavel Laptev
06bd38af5d
fix: pr description scroll
2024-10-07 11:52:48 +02:00
Caleb Owens
359ef1e216
Merge pull request #5050 from gitbutlerapp/fix-upstream-integration-when-no-branches
...
Fix upstream integration when there are no new branches
2024-10-07 11:07:27 +02:00
Caleb Owens
8c01244925
Fix upstream integration when there are no new branches
...
This is important as it will otherwise look like you've got the inverse diff in your uncommited changes.
2024-10-07 11:01:30 +02:00
Esteban Vega
8e7c0a6c87
Merge pull request #5049 from gitbutlerapp/commit-card-fix
...
small-fix: Update the typing of the context menu variable
2024-10-07 10:14:59 +02:00
estib
37f75061c8
small-fix: Update the typing of the context menu variable
...
Compliant with the Svelte linter rules
2024-10-07 09:49:21 +02:00
Pavel Laptev
59b73c7c07
new PR layout
2024-10-06 19:10:37 +02:00
