Commit Graph

9800 Commits

Author SHA1 Message Date
Pavel Laptev
428fc5aee6 fix Spacer repeating gradient 2024-10-25 15:22:06 +02:00
Pavel Laptev
2ed3957ab3 move Spacer to UI 2024-10-25 15:21:33 +02:00
Kiril Videlov
ed84a25334
Merge pull request #5310 from gitbutlerapp/kv-branch-1
CLI: add the ability to create series for a stack
2024-10-25 13:35:06 +02:00
Mattias Granlund
8bdecc2f8e Code cleanup for hunk dependency crate
- reformat comments
- fewer derives
- tighter types
2024-10-25 11:02:22 +02:00
Kiril Videlov
30b5a88c63 CLI: add the ability to create series for a stack 2024-10-25 11:01:28 +02:00
Kiril Videlov
e94b88a53a
Merge pull request #5308 from gitbutlerapp/slightly-older-rust-nightly-version
Go back to slightly older rust version due to rust-analyzer issues
2024-10-25 01:31:00 +02:00
Kiril Videlov
6ae698a4a2 Go back to slightly older rust version due to rust-analyzer issues 2024-10-25 00:19:13 +02:00
Kiril Videlov
83ee370f80
Merge pull request #5306 from gitbutlerapp/fix-bump-flake-rust-overlay
fix(nix): bump rust-overlay flake lockfile
2024-10-24 21:31:51 +02:00
Kiril Videlov
f0f9dee3cc
Merge pull request #5305 from gitbutlerapp/fix-overlapping-context-menus
fix: overlapping context menus
2024-10-24 21:31:21 +02:00
ndom91
f860cf9a26
fix(nix): bump rust-overlay flake lockfile 2024-10-24 20:00:27 +02:00
ndom91
fdc5f8b94d
fix: overlapping context menus 2024-10-24 19:49:54 +02:00
Sebastian Thiel
61f178deda
Merge pull request #5303 from Byron/minor-fixes
minor fixes
2024-10-24 19:22:55 +02:00
Sebastian Thiel
42f632aaf4
avoid allocations for comparisons
Also avoid having an untyped comparison which is easy to get wrong.
2024-10-24 19:17:36 +02:00
Sebastian Thiel
7d12e0bcc7
avoid building doctests
This takes time, and typically there are none.
2024-10-24 19:03:29 +02:00
ndom91
670c7ca44b fix: use custom wix template to avoid update removing shortcuts 2024-10-24 17:39:54 +02:00
Pavel Laptev
d3a0f3108b
Update text areas (#5297)
* reedit "borderlessTextArea" to "Textarea"

* replace old textareas

* Delete TextArea.svelte

* move `TextBox` to UI

* mock the keyboard event

* migrate `Textbox` to svelte 5

* Update PrDetailsModal.svelte

* fix event

* fix text formatting

* Update DialogBubble.svelte

* codereview fixes
2024-10-24 15:37:27 +00:00
ndom91
479973b2fb fix: force libwebkit2gtk-4.0-dev@2.44.3 2024-10-24 17:32:22 +02:00
ndom91
7df85ce4ed fix: stacking accordion typo 2024-10-24 17:26:34 +02:00
Pavel Laptev
a5711a280b
Update ContextMenu.svelte (#5299) 2024-10-24 17:09:17 +02:00
Esteban Vega
53c4701c9c
Merge pull request #5298 from gitbutlerapp/e-branch-4
fix: type all buttons
2024-10-24 16:36:27 +02:00
estib
549f5341d7 lint: ALL BUTTONS HAVE TYPE, FOREVER
Ensure that all buttons have an explicit type so that no button mistakenly submits a form they may be inside of
2024-10-24 16:32:50 +02:00
estib
9d588efbd4 fix: SimpleCommitRow butttons of type button
Apparently buttons without a type inside a form default to `submit`.
In order to open the links in the commit list and not trigger the upstream to be integrated, we need to set the type of the button to `button`
2024-10-24 16:08:42 +02:00
Mattias Granlund
8d3aabae1d Fix bug in hunk dependency calculations
- stacks need their own line shifts when combining them
2024-10-24 15:15:39 +02:00
Esteban Vega
a70de62f2e
Merge pull request #5295 from gitbutlerapp/e-branch-2
fix: Compare branches to the remote target branch
2024-10-24 15:15:23 +02:00
Esteban Vega
356aaf60f8
Merge pull request #5289 from gitbutlerapp/e-branch-1
fix: Don't list the target branch
2024-10-24 15:15:09 +02:00
estib
4178fdd973 fix: Compare branches to the remote target branch
When getting the branch listings, compare the branches to the remote target branch.
This is necessary because of two reasons:
- GitButler doesn't really care about what your local target branch (e.g. main) does, and also doesn't update it as we merge upstream (e.g. origin/main).
- In some cases, a repository might not have a local branch pusgin to the remote target branch (especially in the cases in which branches are merged through a forge)
2024-10-24 14:32:19 +02:00
Mattias Granlund
5dfa719f51 Fix environment dependent test failure
- fixes `non_bare_without_worktree` test on mac with bash 3.2.57
2024-10-24 14:00:56 +02:00
estib
d2df87f1b2 Refname: Add custom comparator for BStr
Add a neat, nice little implementation for comparing Refnames to BStrs
2024-10-24 13:51:27 +02:00
estib
8a2943a11c list branches: Update tests 2024-10-24 12:06:37 +02:00
Pavel Laptev
5f7941d17a
Context menu fixes (#5291)
* added "disabled" prop to Tooltip

* don't show tooltips when the context menu is activated

* correct context menu positioning

* fixes: menu toggling, hold the active card state when the ctx menu is opened
2024-10-24 11:13:49 +02:00
Kiril Videlov
b3caf9257b
Merge pull request #5290 from gitbutlerapp/my_branch
Allow underscore on slugify
2024-10-24 11:12:55 +02:00
Kiril Videlov
2f62bad734 Allow underscore on slugify 2024-10-24 11:03:16 +02:00
estib
bb72296a00 fix: Don't list the target branch
Don't list the target branch in the sidebar
2024-10-24 10:47:33 +02:00
Pavel Laptev
dcd6391c88
New branch menus (#5279)
* added new overflowMenu

* refactor(StackingSeriesHeader): Remove redundant code for opening link and context menu options

* commit context menu added

* refactor: Improve click outside handler in ContextMenu.svelte

* feat(commit): Add ability to insert blank commit above or below existing commit

* refactor(contextmenu): Refactor align logic, remove el and add clientHeight/Width binding

* added: "Activated" state for overflow menu and buttons

* added: conditions for "kebab" buttons when context menu is opened

* fixing context menu positioning

* feat: Add preventDefault to context menu in OverflowMenuItem

* fix: Toggle button label

* added "copy PR" item

* Update OverflowMenuItem.svelte

* Update InsertEmptyCommitAction.svelte

* adde more itrm to the commit context menu

* Update StackingCommitList.svelte

* Update Button.svelte

* fix checks

* change context menu trigger area

* components rename

* restrict context menu actions to the commit type

* Update CommitContextMenu.svelte

* add missing prop

* rearrange buttons

* Update apps/desktop/src/lib/branch/StackingSeriesHeader.svelte

* some buttons had missing kind prop

* move new components to UI

---------

Co-authored-by: Nico Domino <yo@ndo.dev>
2024-10-24 02:46:06 +02:00
Mattias Granlund
d9156fc00b Integrate new hunk dependency algorithm
- behind a project level feature flag
2024-10-23 22:42:46 +02:00
Mattias Granlund
c8a591505a Make context optional when getting commit diffs 2024-10-23 22:42:46 +02:00
Mattias Granlund
1fa97d4468 Fix clippy warnings after toolchain date bump 2024-10-23 22:42:46 +02:00
Mattias Granlund
b772146acc New crate for calculating hunk dependencies 2024-10-23 22:42:46 +02:00
Kiril Videlov
2988c756fe
Merge pull request #5278 from gitbutlerapp/feat-add-push-and-create-pr
fix: enable "push and create PR"
2024-10-23 18:46:35 +02:00
Kiril Videlov
ab2fc429e6
Merge pull request #5286 from gitbutlerapp/kv-branch-1
Refactor list series for Stack
2024-10-23 18:39:44 +02:00
ndom91
4508ff9eaf
fix: ensure upstream name is properly passed to prDetailsModal 2024-10-23 18:04:22 +02:00
ndom91
263de09b84
fix: rename pushBeforeCreate args 2024-10-23 17:57:36 +02:00
ndom91
d4b60d0bc3
fix: simplify pushAndCreate logic 2024-10-23 17:50:47 +02:00
Kiril Videlov
990d564625 Refactor list series for Stack 2024-10-23 17:12:31 +02:00
ndom91
92f25b961c fix(nix): use stable flake inputs 2024-10-23 16:07:45 +02:00
Esteban Vega
f67e0edc41
Merge pull request #5249 from gitbutlerapp/e-branch-12
Project settings: GitForm
2024-10-23 14:40:55 +02:00
Pavel Laptev
3aa4c0b091
Update StackingUpstreamCommitsAccordion.svelte (#5281) 2024-10-23 14:33:16 +02:00
ndom91
b939af8299 fix: ensure pullRequestCard still works in both stacking/non-stacking contexts 2024-10-23 12:05:29 +02:00
ndom91
41b8734012 chore: cleanup CommitDragItem 2024-10-23 12:05:29 +02:00
ndom91
4b11a779ea fix: pull pr monitor and checks monitor creation into each series 2024-10-23 12:05:29 +02:00