Caleb Owens
a233cbcb1f
Added example page for redux
2024-11-20 18:56:35 +01:00
Caleb Owens
fb1d1703ed
Install redux in appropriate packages
2024-11-20 18:56:35 +01:00
ndom91
c13aba6219
feat: add copyToClipboard and text wrap to ErrorSeries card's error msg
2024-11-20 17:23:08 +01:00
estib
70ff5ace3f
fix: Hide the push button if there's nothing to push
...
We can fully trust the patch status when checking whether a patch already has been integrated or published.
2024-11-20 14:53:28 +01:00
Mattias Granlund
596112d89a
Rename uniqueDeduplicate -> shallowDeduplicate
2024-11-20 14:44:34 +01:00
estib
d1b926517b
ai: Pass the correct file hunks when editing a commit message
...
Give the commit message generation method the file changes of the commit that's being edited, instead of the uncommited files
2024-11-20 11:43:53 +01:00
ndom91
6f71ebeaea
fix: commitlist css cleanup
2024-11-20 11:42:31 +01:00
estib
fcaf484b96
PR creation: Correctly set the PR description
...
Prefer using the `input` handler instead of the `change` handler.
The change handler will only update the state variable on blur, while the input handler will do so on key press.
2024-11-20 08:57:51 +01:00
Esteban Vega
788d26722b
Merge pull request #5580 from gitbutlerapp/edit-mode-improvements
...
Edit mode: Display changed state and warn about conflicts
2024-11-20 08:45:13 +01:00
Mattias Granlund
def6d9a2fd
Add option for creating new pr
...
- we automatically re-attach open prs, so we only allow it when pr is closed
2024-11-19 23:35:55 +01:00
Kiril Videlov
42b855f867
Merge pull request #5617 from gitbutlerapp/fix-reopen-merged
...
Do not show "reopen pr" button if merged
2024-11-19 22:35:57 +01:00
Caleb Owens
304919246e
Improve last divergent commit behaviour
...
Previously it didn't consider if there were no diverged commits and or no remote commits. This handles those two cases.
2024-11-19 22:32:30 +01:00
Mattias Granlund
15d3ea7526
Do not show "reopen pr" button if merged
2024-11-19 21:08:52 +00:00
Caleb Owens
d12c1cbd2a
Fail loudly if workspace state out of sync
2024-11-19 22:00:56 +01:00
Mattias Granlund
62ea095eec
Remove duplicate instance of ForgePrMonitor
...
- pr did not refresh after merging
2024-11-19 21:34:50 +01:00
Mattias Granlund
a215cc3d55
Disable merge button if pr base is not target branch
2024-11-19 20:56:14 +01:00
Mattias Granlund
f42a5ecef8
Use stable #each key in SeriesList component
2024-11-19 20:52:12 +01:00
Mattias Granlund
4c212cdd11
Parse url for base branch and pr bases
...
- will help us compare pr base against target
2024-11-19 20:51:56 +01:00
Mattias Granlund
a045cfdc09
Add dervied store that only emits shallow unique values
2024-11-19 20:51:56 +01:00
Caleb Owens
ebaf8ed79b
Remove rouge logging statement that got integrated
2024-11-19 18:39:50 +01:00
estib
96798c6377
Display the resolution state of conflicts
...
Use the new badges in the file-list items to convey whether or not a conflicted file was resolved.
The user can mark them manually as resolved, but they will also be automatically marked as such if it's detectable.
Also:
- Fix the detection of other file change types for non conflicted files
2024-11-19 17:20:39 +01:00
estib
bd7e25694d
File status is calculated the same for any file
...
Local and remote files now are consitently used to derive the file status
2024-11-19 17:09:57 +01:00
estib
3eb27711cb
Diff serialization: rename change type
...
Renam `change_type` to `changeType` for the front-end
2024-11-19 17:08:23 +01:00
Pavel Laptev
9650b0070e
show modified status as a dot
2024-11-19 16:46:26 +01:00
Pavel Laptev
bc5b239964
display border when scroll the commit list
2024-11-19 16:46:26 +01:00
Pavel Laptev
1a2e9eddbd
increase line-height in the commit-card-title
2024-11-19 16:46:26 +01:00
estib
e027e43ccf
Edit mode: Display changed state and warn about conflicts
...
Check whether initially conflicted files are still conflicted. If not, display them as 'Modified' in the files list.
Warn about saving files that still look conflicted.
2024-11-19 16:46:26 +01:00
Caleb Owens
e6c2177db9
Fix commit line colors
...
One problem was that we were over eager in assigning the remote_commit_id property, and ended up with remote commits getting the remote_commit_id set to themselves.
Another problem is that the commit line logic's integrated commit list was supposed to be mutually exclusive from the other arrays. I've added some extra logic to ensure that is the case
2024-11-19 15:16:14 +01:00
ndom91
59a92fc24b
fix: series label icons
2024-11-19 15:06:02 +01:00
estib
ca45ed45fc
Lil' fix for traversing the series
...
Only traverse the valid series
2024-11-19 14:45:15 +01:00
Mattias Granlund
eb4bbedb1e
Fix applying pr from fork
...
- use pr instead of spelling out pullRequest everywhere
- use forked repo owner as remote name when applying pr
- svelte5 syntax upgrade
2024-11-19 13:49:39 +01:00
Kiril Videlov
6b9db1f0b7
Merge pull request #5591 from gitbutlerapp/per-branch-frontend-error-handling
...
feat: handle error branches in the frontend
2024-11-19 13:48:33 +01:00
Mattias Granlund
dfdffc558b
Check for existing fork before adding new one
...
- can prevent a cascading error
- exposes remote urls to front end
2024-11-19 13:45:02 +01:00
ndom91
014e0704ca
fix: series list in stack header
2024-11-19 13:42:37 +01:00
ndom91
d4e81fd227
fix: update errorSeries card
2024-11-19 13:42:27 +01:00
ndom91
9b8755bcd4
feat: use validSeries only where necessary
2024-11-19 13:42:27 +01:00
Esteban Vega
328164ccda
Merge pull request #5600 from gitbutlerapp/e-branch-6
...
PR: Warn the user when creating a PR in the middle of the stack
2024-11-19 13:40:49 +01:00
Mattias Granlund
6ed1b4783e
Use <kbd> for numbering prs in the stack overview section
2024-11-19 13:38:27 +01:00
ndom91
700f65096e
feat: add errorSeries placeholder
2024-11-19 13:34:16 +01:00
ndom91
8d26b7045a
feat: ensure rust result type is parsed and returned to FE as expected
2024-11-19 13:33:43 +01:00
Mattias Granlund
539b418c5e
Drop RemoteBranch in favor of RemoteBranchData
...
- redundant data structure and api removed
- served same purpose as `find_git_branches`
2024-11-19 13:25:29 +01:00
Mattias Granlund
e07eb4906b
Rename remoteBranchService variables -> gitBranchService
2024-11-19 13:25:29 +01:00
Mattias Granlund
f57eff955c
Rename and move remoteBranches.ts -> gitBranch.ts
2024-11-19 13:25:29 +01:00
Mattias Granlund
75c8b6e064
Rename RemoteBranchService -> GitBranchService
2024-11-19 13:25:29 +01:00
Mattias Granlund
d0d2b8bd34
Remove legacy branch listing api
...
- renamed to `find_git_branches` by name
- was only used to get branches for preview
- was unnecessarily being reloaded constantly
2024-11-19 13:25:29 +01:00
Mattias Granlund
a455311adb
Add global rate-limiter for GitHub api requests.
2024-11-19 13:16:08 +01:00
Mattias Granlund
2e18cb7e38
Reduce risk of fetching checks in a loop
...
- weird store/state behavior observed in dev that caused loop
- introduced checks reduce risk of runaway requests
2024-11-19 13:16:08 +01:00
estib
63d3b26f72
PR: Warn the user when creating a PR in the middle of the stack
...
When attempting to create a PR from a series that sits above another that hasn't yet been published, raise a confirmation modal
2024-11-19 12:56:47 +01:00
estib
68bd41a12d
fix: File navigation in commits
...
Commit files were not navigatable because the component was using an old implementation of the selection update method.
2024-11-19 12:13:30 +01:00
Esteban Vega
b655a4b63f
Merge pull request #5596 from gitbutlerapp/no-conflicting-prs
...
Disable PR button on conflict.
2024-11-19 11:00:46 +01:00
