Sebastian Thiel
f7d5380687
Some improvements on top of #5089
...
The PR was merged earlier to not hold it after a passed review,
yet I personally feel strongly enough about the backend portions
to give it another round of polish.
2024-10-16 16:35:06 +02:00
estib
fb152bcc96
PR card updates
2024-10-16 16:20:02 +02:00
Kiril Videlov
055a653979
Stack - correctly flag remote commits when no changeid
2024-10-16 15:53:56 +02:00
Esteban Vega
05e812ca88
Merge pull request #5167 from gitbutlerapp/default-target-on-fresh-install
...
fix: Swallow the default target not found
2024-10-16 15:49:35 +02:00
ndom91
eaa785e3bb
fix: do not allow commit editing for upstream-only commits
2024-10-16 15:42:15 +02:00
estib
dec689c6ab
fix: Swallow the default target not found
...
Don't surface the default target not found. This already is caught at the top level and the user is taken to the 'target not found' page.
2024-10-16 15:35:00 +02:00
Pavel Laptev
a7eef8ff38
center dots
2024-10-16 15:22:27 +02:00
ndom91
6b89ffdecf
fix: bottom commitLine dashed
2024-10-16 15:22:27 +02:00
ndom91
4a3a67ffa5
feat: add seriesDividerLine between series
2024-10-16 15:22:27 +02:00
ndom91
7f63a34925
fix: rename stackingBranch* components to stackingSeries*
2024-10-16 15:22:27 +02:00
Esteban Vega
a2af3bb560
Merge pull request #5161 from gitbutlerapp/fix-input-auto-select-on-start-commit
...
fix: Auto-focus on 'Start commit'
2024-10-16 12:34:37 +02:00
estib
5de8266530
fix: Auto-focus on 'Start commit'
...
The auto-focus on the commit message input would not work, as the input would not be yet mounted.
Wait for the input to be mounted (`$expanded = true`) and then focus on it.
2024-10-16 12:24:01 +02:00
Kiril Videlov
a2506177f1
Use new integrate upstream in stacked up
2024-10-16 12:22:14 +02:00
Kiril Videlov
b6ec442a4a
Implement integrate upstream commits for the stacked flow
...
refactor integrate upstream code for the stacked flow
fix semantics
2024-10-16 12:03:20 +02:00
Kiril Videlov
c5f20160bc
Stack - optimize getting commit by change id
...
Pass the merge base instead of computing it every time
refactor stack
2024-10-16 20:55:50 +02:00
ndom91
a738db6150
fix: dont show empty state if there are upstreamPatches
2024-10-16 12:02:14 +02:00
Sebastian Thiel
22f0e4ab36
Merge pull request #5089 from Zamoca42/feat/parse-binary-file
...
feat: Parse & display binary files
2024-10-16 11:36:28 +02:00
Kiril Videlov
606354abfd
Merge pull request #5159 from gitbutlerapp/branch
...
Fix on fix: Push button on scroll and small UI tweaks
2024-10-16 10:15:01 +02:00
Kiril Videlov
e4294d02b7
Merge pull request #5142 from xxxoooxoxo/master
...
feat: add support for default code editor (Zed)
2024-10-16 00:48:10 +02:00
Ali Houssain Sareini
caf1b92b89
Merge branch 'master' into master
2024-10-15 18:33:23 -04:00
Ali Houssain Sareini
d06593bcd1
lint
2024-10-15 18:28:44 -04:00
Pavel Laptev
bf6ef90afe
style: fix double top border on Stacking lanes
2024-10-15 23:50:33 +02:00
Pavel Laptev
e6eb938dc5
refactor: Add intersection observer to lane-branches action for scroll visibility
2024-10-15 23:44:04 +02:00
ndom91
72281cb207
fix: do not allow user to generate series name after branch has been pushed
2024-10-15 22:41:14 +02:00
Kiril Videlov
046036b41f
Merge pull request #5150 from gitbutlerapp/branch-entries-cleanup
...
Branch entries cleanup
2024-10-15 20:05:42 +02:00
ndom91
a2c010f66a
fix: don't fail if the file isn't there anymore after discarding hunk
2024-10-15 19:01:35 +02:00
ndom91
7241902704
fix: update copy for contextMenu labels
2024-10-15 18:46:05 +02:00
ndom91
1f0dca4646
feat: add 'generate branch name' to stack series header
2024-10-15 18:46:05 +02:00
ndom91
ee3c1f4023
fix: use some to express intent better in other commit cases
2024-10-15 18:17:38 +02:00
ndom91
f4dfceaa4d
fix: add additional case for when to show push/force push btn
2024-10-15 18:17:38 +02:00
Pavel Laptev
3620ad6093
style(StackSeries, Stack): update padding in StackSeries and Stack components ( #5154 )
2024-10-15 17:55:58 +02:00
Kiril Videlov
998f12d0a1
Merge pull request #5151 from gitbutlerapp/better-default-branch-names
...
Stack - improved automatic reference names
2024-10-15 17:12:18 +02:00
ndom91
6b90a0cbec
fix: upstream label slash bug
2024-10-15 17:10:46 +02:00
ndom91
f1d2892bec
fix: show only stack push btn when necessary
2024-10-15 17:04:52 +02:00
ndom91
85df49e009
feat: add stack header sticky property and new count btns
2024-10-15 16:41:01 +02:00
Kiril Videlov
be24f64c12
Stack - improved automatic reference names
...
Now the template for new references is "branch-n"
2024-10-15 16:40:51 +02:00
Pavel Laptev
c6482a94de
Improve modal UI and discard changes ( #5148 )
...
* style(modal): Update header padding and add color to body
* style: Update font color in modal body paragraphs
* feat(ui): improve DemoModal structure and props usage
* style: Remove unnecessary global styles from Modal component
* feat(ui): Update DemoModal component onclick event and add onSubmit handler
* StoryBook: Update text in DemoModal
* add missing "submit"
* modal lint/checks fixes
* Update "Discard changes" modal
2024-10-15 16:25:02 +02:00
Kiril Videlov
55b91a484f
GC branch entries on fetch
2024-10-15 16:22:10 +02:00
Kiril Videlov
5b39495062
implement GC for branch entries
...
Garbage collects branches that are not in the workspace and hold no changes:
1. They do not have a WIP commit
2. They have no regular commits
2024-10-15 16:21:40 +02:00
Pavel Laptev
436cd41f44
fix(ui): Change onmousedown to onclick in Segment.svelte ( #5147 )
2024-10-15 15:10:10 +02:00
Kiril Videlov
202ec5ac0b
If a lane has no commits and no incommited changes unapply means delete
...
There is nothing to keep
2024-10-15 15:04:24 +02:00
Kiril Videlov
a20c2304df
unapply_without_saving of a (v)branch now also delete persisted state
2024-10-15 15:03:43 +02:00
Caleb Owens
1345c324db
Initial implementation of patch stack service
2024-10-15 14:51:29 +02:00
Esteban Vega
c94c5b860b
Merge pull request #5146 from gitbutlerapp/fix-move-commit
...
fix: Move any commit from branch to branch
2024-10-15 14:38:43 +02:00
estib
44c376e48d
fix: Move any commit from branch to branch
...
Move any commit won't duplicate the commit in both virtual branches.
Also:
- Also add tests to catch this
2024-10-15 14:28:56 +02:00
Chooooooo
f178c4fed4
Update read_file_from_workspace logic
...
- Refactor `read_file_from_workspace` to separate `HEAD^{tree}` lookup logic
- Add new `read_file_from_tree` function to handle both `HEAD^{tree}` and specific commit lookups
- Add edge case handling for querying files from a specific commit in `read_file_from_workspace`
- Add conditions to handle modified or deleted files in worktree
- Improve file status handling with new `FileStatus` enum
- Update `FileInfo` struct to include file status information
2024-10-15 21:26:39 +09:00
Pavel Laptev
4d84a87f5c
Fix button type for modals ( #5145 )
2024-10-15 14:19:00 +02:00
Ali Houssain Sareini
f96f1ae2c3
refactor: Display selected code editor over generic Editor
2024-10-15 08:02:34 -04:00
Ali Houssain Sareini
08bd7f7129
added support for new default editor type in settings
2024-10-15 08:01:53 -04:00
Ali Houssain Sareini
f53a232052
fix lint error
2024-10-15 07:37:29 -04:00
