gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-24 05:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,712 Commits 146 Branches 1,015 Tags 63 MiB
e1401d11af
Commit Graph

9712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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