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
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
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
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
Nico Domino
77c6529688
fix: use showStackingDetails persisted writable instead of function import ( #5042 )
2024-10-04 18:36:24 +02:00
Esteban Vega
4d419a5001
Merge pull request #5016 from gitbutlerapp/add-tests-for-moving-commits
...
Factor out the `move_commit` function
2024-10-04 18:34:56 +02:00
Nico Domino
1d4f5f6762
fix: upstream commits accordion and cards ( #5044 )
2024-10-04 15:42:04 +00:00
Esteban Vega
d8df95efc8
Merge pull request #5043 from gitbutlerapp/fix-zoom-initialization
2024-10-04 16:10:48 +02:00
estib
c6f19bc1ff
fix: Correctly update the zoom from the settings
2024-10-04 16:00:19 +02:00
Mattias Granlund
65a335dd5e
chore: eslint ignore storybook static files
2024-10-04 14:33:48 +02:00
Mattias Granlund
c951f01c98
Fix lint errors
2024-10-04 12:43:26 +02:00
Mattias Granlund
3b1725cfc4
Add key to #each over patch series
...
- prevents funny things from happening
2024-10-04 12:43:26 +02:00
ndom91
4c2fe5929a
fix: branch header dynamic title size
2024-10-04 12:43:26 +02:00
Mattias Granlund
eede90ac96
Fix rebasing commits between stacked series
2024-10-04 12:43:26 +02:00
Mattias Granlund
80d8182ecb
Add prompt for patch series name
...
- new prompt when adding blank group
- aligned with prompt when adding group to existing commit
2024-10-04 12:43:26 +02:00
Mattias Granlund
ae1efad769
Fix: link related commits found in new series data
2024-10-04 12:43:26 +02:00
Mattias Granlund
5e326710c7
Rename "Add ref" to "Add branch"
2024-10-04 12:43:26 +02:00
Mattias Granlund
5c26def86b
Improve stack header dropdown
2024-10-04 12:43:26 +02:00
Mattias Granlund
25fad4f376
Implement backend call for "rename series"
2024-10-04 12:43:26 +02:00
Mattias Granlund
a43523d157
Fix: send correct name when creating a series
2024-10-04 12:43:26 +02:00
Mattias Granlund
490febec5c
Implement backend call for "remove series"
2024-10-04 12:43:26 +02:00
Mattias Granlund
3eaa991385
Fix the new series button at the top
2024-10-04 12:43:26 +02:00
Mattias Granlund
31f5bb38c9
Make push button sticky in stacking mode
2024-10-04 12:43:26 +02:00
Mattias Granlund
4f2291e37c
Fix: state_unsafe_mutation workaround
...
An alternative fix would be to initialise the loading store at first load in order to avoid changing it immediately on `start()`, that's what causes the error.
2024-10-04 12:43:26 +02:00
Mattias Granlund
548263e538
Use correct branch names, prs etc for a patch series
...
- create pr button not working entirely, something to do with ref not being pushed
2024-10-04 12:43:26 +02:00
ndom91
2bba8cbae6
fix: stackingCommitCard and handle remoteRef:null in groupCommitsByRef
2024-10-04 12:43:26 +02:00
ndom91
979ed50510
feat: match stackingBranchHeader and statusIcon colors to top commit
2024-10-04 12:43:26 +02:00
ndom91
b46c397c60
feat: add StackingBranchHeader contextMenu and handlers for contextMenuItems as well as their Modals
2024-10-04 12:43:26 +02:00
ndom91
9ba5ecbf65
feat: add openExternalBranch iconButton
2024-10-04 12:43:26 +02:00
ndom91
2af2e34bc0
feat: finish implementing upstream commits accordion
2024-10-04 12:43:26 +02:00
Mattias Granlund
8bdeb3f635
Cleanup experimental stacking feature
...
- initial "new stacking branch" card
- persist setting for show stacking details
- separates out individual branch / pr header
- stack files in separate folder
- implements upstream commits accordion
2024-10-04 12:43:26 +02:00
Kiril Videlov
d262b230a8
Merge pull request #5036 from gitbutlerapp/add-series-top-base-implementation
...
Stacking - fixes an issue where its not possible to create additional series for the base of the stack
2024-10-04 00:29:26 +02:00
Kiril Videlov
ac4828736f
Merge pull request #5035 from gitbutlerapp/update-series-description-and-push-stack
...
Stack api: Dont try to push series that are pointing to the Stack base
2024-10-04 00:25:16 +02:00
Kiril Videlov
d15e41ee73
Stacking - fixes an issue where its not possible to create additional series for the base of the stack
2024-10-03 15:22:20 -07:00
Kiril Videlov
eb88ed01c6
Stack api: Dont try to push series that are pointing to the Stack base
2024-10-03 20:52:27 +02:00
Kiril Videlov
deef297744
Merge pull request #5033 from gitbutlerapp/refactor-api
...
refactor stack api for series creation
2024-10-03 20:24:41 +02:00
Kiril Videlov
ef1c7c139d
Simplify CreateSeriesRequest
...
If `preceding_head` is provided, only the name of the series is sufficient
2024-10-03 20:12:49 +02:00
Kiril Videlov
efa5cbc7fd
Makes it easier to create new series to the top of the stack
...
Adds an extra convinience API that does not require knowledge of what is the latest commit
2024-10-03 20:04:20 +02:00
Kiril Videlov
7ab8fdf0b8
Merge pull request #5031 from gitbutlerapp/series-on-list-virtual-branches-order
...
Fixes the order of series on the UI API (list_virtual_branches)
2024-10-03 18:56:36 +02:00
Kiril Videlov
57753e43a8
Merge pull request #5030 from gitbutlerapp/rm-change-reference
...
Refactor - removes the change_refernce module that what the initial imlementation of stacking
2024-10-03 18:56:10 +02:00
Kiril Videlov
cd4ec147b1
Fixes the order of series on the UI API (list_virtual_branches)
...
The UI needs the list starting with newest first.
Updated docs.
2024-10-03 18:50:56 +02:00
Kiril Videlov
e63e876ca5
Refactor - removes the change_refernce module that what the initial imlementation of stacking
...
This is now replaced with the more capable and correct `Stack` trait, implemented on `Branch`.
The new endpoints are:
create_series,
remove_series,
update_series_name,
update_series_description,
push_stack,
2024-10-03 18:39:50 +02:00
Esteban Vega
ec4d1b941c
Merge pull request #5028 from gitbutlerapp/fix-update-the-dd-button-type
...
fix: Update the type of the drop down button
2024-10-03 12:41:16 +02:00
estib
94fa0fed5d
fix: Update the type of the drop down button
...
Fix up the type of variable used to refernce the drop down button in the PR button component
2024-10-03 11:58:01 +02:00
Kiril Videlov
3fc1687f86
Merge pull request #5027 from gitbutlerapp/reverse-patches-in-stack-series
2024-10-03 07:22:34 +02:00
Kiril Videlov
fdf26be501
Merge pull request #5026 from gitbutlerapp/merge-base-range-optimization
2024-10-03 07:22:09 +02:00
