estib
7dbadb13a9
Get the upstream name from the pushed virtual branch
...
Once the push of a virtual branch succeeded, return the ref name and the remote name in order to correctly determine which branch name to create a PR from.
2024-09-16 18:15:06 +02:00
Esteban Vega
5b34cc75bd
Merge pull request #4925 from gitbutlerapp/commit-context-menu
...
Add commit context menu
2024-09-16 17:31:59 +02:00
Kiril Videlov
f130cb2458
Merge pull request #4927 from gitbutlerapp/fix-branch-name-from-ref
...
fix: Extract the name from the remote ref correctly
2024-09-16 17:03:08 +02:00
Caleb Owens
aac703afa7
Merge pull request #4909 from gitbutlerapp/Improve-applying-branches
...
Improve applying branches
2024-09-16 16:48:50 +02:00
Caleb Owens
cc8d3f4810
Did shit good
2024-09-16 16:42:23 +02:00
Esteban Vega
4c00fce37b
Merge pull request #4923 from gitbutlerapp/default-remote-selection
...
Project target setup: Use default remote
2024-09-16 16:13:51 +02:00
estib
a9c58aa35a
fix: Extract the name from the remote ref correctly
...
Correctly extract the name of the remote branch, supporting branch names with nested paths
Also: Add tests
2024-09-16 16:05:12 +02:00
Kiril Videlov
c58460c5ad
feat: Add a new dad joke to dad-jokes.txt.
2024-09-16 15:55:23 +02:00
Kiril Videlov
84bf4076b3
Merge pull request #4924 from gitbutlerapp/dad-jokes
...
dad jokes file
2024-09-16 15:54:04 +02:00
estib
d712fa88d1
Add commit context menu
...
Add a context menu to the commit card
2024-09-16 15:32:11 +02:00
Scott Chacon
711474e2bc
dad jokes file
...
this is pretty important
2024-09-16 14:32:58 +02:00
estib
1398f6853b
improvement: Default the selection of the project remote
...
The remote for a new project will default to the remote of the selected branch. It can be overwritten if needed.
2024-09-16 14:10:10 +02:00
estib
9772c02edc
Base Branch Service: Type the remote branch information
2024-09-16 14:03:33 +02:00
estib
75defc2ae6
Array utils: unique items
2024-09-16 14:00:05 +02:00
estib
2dae466162
Branch Utils: enhance branch utilities with ranking functions
...
Add functions to determine the best branch and best remote. Implement a branch ranking system based on exact matches and suffix matches to better
prioritize branches.
2024-09-16 13:59:17 +02:00
Nico Domino
a0b83556d2
feat: create 'Apperance' settings page and add highlight branchlane setting ( #4921 )
...
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-16 12:49:28 +02:00
Nico Domino
d7c00a0b9f
fix: rm effect.pre used only to avoid previous bug ( #4919 )
2024-09-16 12:20:34 +02:00
Mattias Granlund
02d6b6db9e
Fix mistake in push failure error capature
2024-09-16 11:58:31 +02:00
Esteban Vega
07c6db3643
Merge pull request #4884 from gitbutlerapp/keyboard-shortcuts
...
Add some nice keyboard shortcuts for staging and selecting
2024-09-16 11:45:27 +02:00
estib
c9a5d7a75d
Branch file list: Remove comments about actions
2024-09-16 11:42:04 +02:00
estib
08fb9effc4
Merge remote-tracking branch 'origin/master' into keyboard-shortcuts
2024-09-16 11:40:23 +02:00
Esteban Vega
b087235540
Merge pull request #4918 from gitbutlerapp/fix-commit-drag-item
...
fix: actions initialization for CommitDragItem
2024-09-16 10:50:08 +02:00
estib
79e25de197
fix: actions initialization for CommitDragItem
...
Use a derived store to compute actions based on the branch and commit,
removing the need for a side effect. This enhances readability and
ensures that actions are updated reactively whenever dependencies change.
2024-09-16 10:33:16 +02:00
Kiril Videlov
57c3e8b5d2
Merge pull request #4900 from Byron/better-locking
...
ignore lock-errors on filesystems that lack support
2024-09-16 10:22:51 +02:00
Mattias Granlund
b4f30530b0
Drop unnecessary mapping of error code on push failure
...
- the removed line would overwrite any previously set code
- unknown is still the default if code is missing
2024-09-16 10:20:14 +02:00
Mattias Granlund
97d117bb02
Improve push failed error analytics
...
- error message was not being included
2024-09-16 10:20:14 +02:00
Kiril Videlov
5a0cfcd2b8
Merge pull request #4912 from Byron/create-wd-tree
...
create a worktree-tree without an intermediate index
2024-09-16 10:19:37 +02:00
Kiril Videlov
def3692df8
Merge pull request #4917 from gitbutlerapp/fix-pr-infinite-loop
...
fix: Don't update the state with the pre-effect
2024-09-16 10:10:00 +02:00
Esteban Vega
5faa0ac1b5
Merge pull request #4916 from gitbutlerapp/fix-file-selectability
...
fix: Only allow hunk selection in uncommited files
2024-09-16 10:08:35 +02:00
estib
3eadc2e743
fix: Don't update the state with the pre-effect
...
It seems like this would lead to an infinite loop in some cases
2024-09-16 10:03:29 +02:00
Esteban Vega
fb3ca9cc6e
Merge pull request #4897 from gitbutlerapp/hunk-borders-alternative
...
Fix HunkDiff borders
2024-09-16 09:54:06 +02:00
estib
2467b87fda
fix: Only allow hunk selection in uncommited files
...
Files hunks from the commits should not be selectable
2024-09-16 09:50:59 +02:00
Pavel Laptev
8ec4fbdd67
few CSS fixes
2024-09-15 23:07:04 +02:00
estib
2bf882676f
fix HunkDiff borders
...
The borders move with the hunk diffs
2024-09-15 10:49:47 +02:00
Sebastian Thiel
31626b726b
Edit trees directly when running create_wd_tree() to bypass the index.
2024-09-14 18:48:01 +02:00
Pavel Laptev
1c70cdc3f4
Fixes scroll on drag ( #4913 )
...
* remove old tailwind CSS class
* fix `onDestroy` lifecycle error
* fix scroll glitch for changed files while dragging
2024-09-14 17:43:06 +02:00
Sebastian Thiel
099ac50f5d
update gix to get tree-editing capabilities
2024-09-14 15:35:08 +02:00
Sebastian Thiel
6285d9177e
fix: ignore lock-failures on filesystems that don't support it ( #4895 )
...
Just like `cargo` does.
2024-09-14 08:48:17 +02:00
Mattias Granlund
ba360d2e85
Base avatar bg color on srcUrl instead of tooltip ( #4903 )
...
* Base avatar bg color on srcUrl instead of tooltip
- consistent per author
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-13 23:20:37 +00:00
Esteban Vega
1a47f5ec4d
Merge pull request #4850 from gitbutlerapp/ndom91/use-template-dropdown
...
fix: refactor pr template path input to pre-filled `Select` instead of `TextBox`
2024-09-13 17:25:58 +02:00
Caleb Owens
be4652653a
Handle merge commits better in edit mdoe
2024-09-13 17:20:13 +02:00
Caleb Owens
56fb839eee
Merge pull request #4908 from gitbutlerapp/Unapplying-rename
...
Rename unapplying
2024-09-13 17:04:07 +02:00
Caleb Owens
edd0cbe0e6
Rename unapplying
2024-09-13 16:58:42 +02:00
Nico Domino
c952ffee65
Merge branch 'master' into ndom91/use-template-dropdown
2024-09-13 16:28:58 +02:00
Caleb Owens
0d138fe2f8
Merge pull request #4907 from gitbutlerapp/Fix-selecting-default-target-button
...
feat: Add onclick prop to DefaultTargetButton
2024-09-13 16:09:09 +02:00
Caleb Owens
ce2aa91385
feat: Add onclick prop to DefaultTargetButton
...
Add onclick prop to DefaultTargetButton component to enable
button functionality. This change allows the component to handle
click events and perform specified actions when the button is
clicked.
2024-09-13 16:07:25 +02:00
Caleb Owens
d995a04b31
Correct merge commit logic
2024-09-13 12:57:46 +02:00
ndom91
147a8aafcd
fix: tweak copy
2024-09-13 12:56:08 +02:00
Caleb Owens
4ff32885e4
Start using new rebasing code when applying branches
2024-09-13 12:34:21 +02:00
Caleb Owens
e626a6f6ba
Resolve creation/deletion conflicts
2024-09-13 12:32:01 +02:00
