Commit Graph

455 Commits

Author SHA1 Message Date
estib
d8b2bee18c fix: Lint errors 2024-10-04 10:35:17 +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
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 () 2024-10-04 18:36:24 +02:00
Nico Domino
1d4f5f6762
fix: upstream commits accordion and cards () 2024-10-04 15:42:04 +00:00
estib
c6f19bc1ff fix: Correctly update the zoom from the settings 2024-10-04 16:00:19 +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
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
Pavel Laptev
47c0bad9ac
fix: diff example "added/deleted" lines () 2024-10-03 00:22:00 +02:00
Esteban Vega
c4fc0923ce
Merge pull request from gitbutlerapp/add-scroll-area-to-the-edit-mode
Edit mode: Add a max height and scrollable container
2024-10-02 13:28:19 +02:00
Pavel Laptev
3b280597fa layout update + remove "ActionView" component 2024-10-02 12:07:11 +02:00
Mattias Granlund
3008244201 Fix errors that appeared after svelte plugin upgrade 2024-10-02 11:26:15 +02:00
Mattias Granlund
332bbb3c1d Fix bind:this={} for Svelte5 components
- needs `ReturnType` and `typeof` to work correctly
- svelte-check does not recognise this type bug yet
- vscode svelte plugin started complaining a week ago
2024-10-02 11:25:31 +02:00
Pavel Laptev
3470a73999 header "files amount" badge added 2024-10-02 11:21:16 +02:00
estib
88b0f204bf Edit mode: Add a max height and scrollable container
In order to be able to display large edit mode files list without having to scroll the whole page to the bottom, add a scrollable container to the commits file list
2024-10-02 10:01:52 +02:00
estib
7ce815a7ca Markdown: Add BR and strong
Add new-line and bold-text rendereres for the Markdown component
2024-10-01 17:15:31 +02:00
estib
924706092b ai: Enable streaming
Ability to stream the LLM responses into the UI.
2024-09-28 13:17:37 +02:00
estib
0f05b435ba Result: Add async transformer 2024-09-28 13:15:44 +02:00
estib
76dd98b982 Add Anthropic SDK 2024-09-28 13:13:43 +02:00
estib
3424f7781b ai: Add PR description method
Add a method to the AI service that takes in some context about a PR and creates a description body out of it
2024-09-26 15:25:41 +02:00
Pavel Laptev
4fd1712994
Small UI updates ()
* design tokens update

* update "update" icon

* increase button icons contrast

* Fix: button layout

* made "fast" transition variable even faster

* update "virtual-branch-small" icon

* bigger file icons, remove "fileName" property

- Larger file icons.
- The file path label in the "FileListItem" included the file name, but it should only contain the folder path.
- Since the "filePath" string already includes the file name, it's easier to split it within the "FileListItem" component, rather than passing the file name as a separate prop.
2024-10-01 16:08:03 +02:00
estib
945f991ad3 Edit mode: Open the conflicted files in the IDE
Add the ability to right-click a file in the list to open it in the selected IDE.
Also add a button that opens all the conflicted files automatically.
2024-09-30 19:11:51 +02:00
estib
a169b41594 fix: Correctly detect conflicted files
Correctly detect and display whether the commit file is conflicted in the edit mode page
2024-09-30 18:38:20 +02:00