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
Ali Houssain Sareini
8779cce0da
rename openInVSCode to openInEditor
2024-10-15 07:37:14 -04:00
Ali Houssain Sareini
475975b0f4
added CodeEditorSettings type in settings
2024-10-15 07:35:03 -04:00
Pavel Laptev
62ffe0986d
Revert dialog modal implementation ( #5143 )
...
* rename `default` size to `medium`
* animation on close and focus trap
* focus trap fix
* fix clickoutside bug with open select
* Update focusTrap.ts
* fix check
* remove unnesessery code
2024-10-15 10:45:09 +02:00
Kiril Videlov
8b79007165
Merge pull request #5138 from gitbutlerapp/dependabot/github_actions/Swatinem/rust-cache-2.7.5
...
build(deps): bump Swatinem/rust-cache from 2.7.3 to 2.7.5
2024-10-15 10:25:28 +02:00
Ali Houssain Sareini
ce3e718d29
revert BranchLaneContents removal in settings
2024-10-14 20:22:43 -04:00
Ali Houssain Sareini
2dc631e16e
Merge pull request #2 from xxxoooxoxo/Virtual-branch
...
refactor: replace VSCode with generic editor
2024-10-14 20:07:34 -04:00
Ali Houssain Sareini
e3c493a060
refactor: replace VSCode with generic editor
2024-10-14 20:05:07 -04:00
Ali Houssain Sareini
f529e1ee69
Merge pull request #1 from xxxoooxoxo/Virtual-branch
...
add-zed-as-editor-option
2024-10-14 19:46:50 -04:00
Ali Houssain Sareini
28fa6720b3
refactor: Update code editor paths to use editor from userSettings
2024-10-14 19:43:38 -04:00
Ali Houssain Sareini
0d0652c351
feat(ui): Add default code editor to settings/appearance
2024-10-14 19:43:15 -04:00
Ali Houssain Sareini
2394f38b9b
refactor(settings): Add default code editor settings
2024-10-14 19:42:26 -04:00
Ali Houssain Sareini
4daeb53dba
feat: Add support for the 'zed' URL scheme
2024-10-14 19:36:51 -04:00
Kiril Videlov
dcf645da6c
Merge pull request #5141 from gitbutlerapp/handle-undo-commit
...
Stacking flow/ UI handles already pushed vbranches
2024-10-14 23:42:18 +02:00
Kiril Videlov
d168588596
change default stack series reference to match the virtual branch legacy one if set
...
This is only applicable during the migration period - when a virtual branch has been pushed, and therefore there is a reference set. If that is the case, this will make the default series reference match that reference name
2024-10-14 20:49:49 +02:00
Chooooooo
e789eb1a55
Add preview support for untracked binary files
2024-10-15 03:31:28 +09:00
Caleb Owens
562ad1493b
Merge pull request #5140 from gitbutlerapp/no-push-hooks
...
Pass --no-verify to git push
2024-10-14 18:45:38 +02:00
Caleb Owens
22daef3681
Merge pull request #5136 from gitbutlerapp/Update-how-auth-tokens-are-passed-about
...
Update how auth tokens are passed about
2024-10-14 18:29:04 +02:00
Caleb Owens
94ff87a72c
Pass --no-verify to git push
2024-10-14 18:27:58 +02:00
Caleb Owens
5f49663265
Update how auth tokes are passed around
...
I forgot to run pnpm check
I forgot to run pnpm test
2024-10-14 17:31:02 +02:00
dependabot[bot]
34fe5ba4a5
build(deps): bump Swatinem/rust-cache from 2.7.3 to 2.7.5
...
Bumps [Swatinem/rust-cache](https://github.com/swatinem/rust-cache ) from 2.7.3 to 2.7.5.
- [Release notes](https://github.com/swatinem/rust-cache/releases )
- [Changelog](https://github.com/Swatinem/rust-cache/blob/master/CHANGELOG.md )
- [Commits](https://github.com/swatinem/rust-cache/compare/v2.7.3...v2.7.5 )
---
updated-dependencies:
- dependency-name: Swatinem/rust-cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-14 15:12:26 +00:00
Chooooo
b4c84fdfd8
Merge branch 'master' into feat/parse-binary-file
2024-10-15 00:07:28 +09:00
ndom91
c5efb7f246
fix: dont show 'set remote branch name' option in stack header contextMenu
2024-10-14 16:40:45 +02:00
Kiril Videlov
e8732f72e2
initialize stack with the same reference as the legacy reference
2024-10-14 16:29:38 +02:00
Pavel Laptev
ba2d95a338
style: button color updates ( #5134 )
2024-10-14 15:42:55 +02:00
Nico Domino
88611b6ab5
fix: layout updates
2024-10-14 15:40:47 +02:00
ndom91
f2fffce255
feat: add additional feature flag to disable adding multiple series within a stack
2024-10-14 15:40:47 +02:00
ndom91
5e7e87cab1
fix: hide commitList if there are no commits
2024-10-14 15:37:33 +02:00
ndom91
49a4f2581f
fix: do not show upstream label when branch has not been pushed yet
2024-10-14 15:03:32 +02:00
Pavel Laptev
3fdc4d1b1e
UI: PR card tweaks ( #5131 )
...
* add tooltips
* fix kebaba size and margins
2024-10-14 14:49:54 +02:00
Pavel Laptev
31020d9dec
style(ui): Simplify label badge conditional rendering in IntegrationSeriesRow ( #5130 )
2024-10-14 14:27:37 +02:00
Esteban Vega
fdd64015b7
Merge pull request #5110 from gitbutlerapp/fix-histroy-pagination
...
fix: History lazy loading
2024-10-14 14:15:53 +02:00
Sebastian Thiel
0be8710752
Merge pull request #5111 from Byron/fix-5096
...
Probably fix #5096
2024-10-14 14:03:31 +02:00
ndom91
90ae4eccd9
fix: dont allow changing series name once pushed
2024-10-14 13:48:07 +02:00
ndom91
5724136e88
fix: change stacking header line alignment
2024-10-14 12:29:37 +02:00
ndom91
26784d1ae7
fix: divergent commit shorten to 7 char sha
2024-10-14 12:22:18 +02:00
ndom91
0ff749f036
fix: show diverged commitId in diverged state
2024-10-14 12:03:15 +02:00
Pavel Laptev
1b8cfd2723
Merge pull request #5126 from gitbutlerapp/Fix-remove-sidebar-focus-state
...
feat: Remove tabindex attribute from Navigation menu
2024-10-14 11:56:25 +02:00
Pavel Laptev
2797afd5c0
clear the AI description body after generation
2024-10-14 11:43:09 +02:00
Pavel Laptev
cf08814bee
feat: Remove tabindex attribute from Navigation menu
2024-10-14 11:32:56 +02:00
Esteban Vega
ae283c4a65
Merge pull request #5123 from gitbutlerapp/fix-state-update-for-PR-modal-title
...
fix: Title state update for the PR modal
2024-10-14 11:28:17 +02:00
