Commit Graph

9930 Commits

Author SHA1 Message Date
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
Kiril Videlov
454dc72e2d
Merge pull request #5277 from gitbutlerapp/kv-branch-1
Fixes a problem where re-applying a pushed branch creates a new reference rather than reusing the existing one
2024-10-23 12:00:41 +02:00
ndom91
d8971787f8 fix: show commit fileList when there are only conflictedFiles 2024-10-23 11:58:01 +02:00
Kiril Videlov
abea43c5d4 Fixes a problem where re-applying a pushed branch creates a new reference rather than reusing the existing one
The most visible aspect to this issue was that the branch will not show any existing PRs afterwards
2024-10-23 11:47:53 +02:00
ndom91
6c0033bb33 fix: test typo 2024-10-23 11:09:39 +02:00
ndom91
cca10524bf fix: dont force runes on packages/ui - storybook still doesnt support 2024-10-23 11:09:39 +02:00
ndom91
7cae1e6972 fix: failing service.test 2024-10-23 11:09:39 +02:00
ndom91
e5f63c557c chore: eslint ignore storybook stories for now 2024-10-23 11:09:39 +02:00
ndom91
d8a22b5196 fix: cleanup @typescript-eslint rules 2024-10-23 11:09:39 +02:00
ndom91
c7140bd2e0 fix: apps/web eslint issues 2024-10-23 11:09:39 +02:00
ndom91
09297430e0 fix: apps/desktop eslint issues 2024-10-23 11:09:39 +02:00
ndom91
26713898b8 fix: packages/ui eslint issues 2024-10-23 11:09:39 +02:00
ndom91
f928b25fff fix: update tsconfig related options 2024-10-23 11:09:39 +02:00
ndom91
1838fab7c3 fix: enable svelte.config runes mode explicitly 2024-10-23 11:09:39 +02:00
ndom91
f34f1f2ebf fix: bump eslint related deps 2024-10-23 11:09:39 +02:00
ndom91
3a233b64e3 fix: update eslint.config based on svelte5 example 2024-10-23 11:09:39 +02:00
Esteban Vega
785a04dbe5
Merge pull request #5273 from gitbutlerapp/e-branch-1
style: Fix the history container z-index
2024-10-23 09:43:26 +02:00
estib
2107e0e7a5 style: Fix the history container z-index
Fix the side-view container so that it is rendered above the lane headers
2024-10-23 09:41:00 +02:00
ndom91
9be297edbf fix: ensure anthropic api endpoint can be reached in nightly and release builds 2024-10-22 18:37:48 +02:00
ndom91
af8955ccf1
fix: enable "push and create PR" 2024-10-22 18:35:42 +02:00
Christoph Hollizeck
953fbeedba improvement: introduce direnv .envrc and update gitignore accordingly 2024-10-22 17:06:55 +02:00
Kiril Videlov
521d3994a4
Merge pull request #5270 from gitbutlerapp/kv-branch-1
Remove stack extention trait - now it can be an impl block
2024-10-22 16:15:58 +02:00