Sebastian Thiel
82aa2d1760
use gix powered merge-base for performance and reduced memory consumption
2024-08-26 19:35:09 +02:00
Caleb Owens
e463e2b2e9
Correct the tree side which we write
2024-08-26 19:34:44 +02:00
Sebastian Thiel
4ad8c0ed11
use latest gix to make merge-base available.
2024-08-26 19:34:21 +02:00
Kiril Videlov
66257fba2f
rename reference module to change_reference
2024-08-26 19:15:58 +02:00
Nico Domino
b287516cc7
feat: use PR template when available ( #4736 )
2024-08-26 17:08:37 +02:00
Kiril Videlov
89d1186b06
refactor this to be a ChangeReference
...
it turns out that a reference to a change_id is all that we need
2024-08-26 17:02:38 +02:00
Mattias Granlund
2f684d620b
Suppress up-to-date if not invoked manually
2024-08-26 15:32:52 +01:00
Caleb Owens
564cd06666
Merge pull request #4756 from gitbutlerapp/Comments-and-another-enum-correction
...
Commits and another enum correction
2024-08-26 15:45:45 +02:00
Caleb Owens
f6dae49a8d
Commits and another enum correction
2024-08-26 15:40:22 +02:00
Pavel Laptev
99dcf812c4
Add zoom functionality with keyboard shortcuts and update menu actions for the View item ( #4753 )
...
* feat: Add zoom functionality with keyboard shortcuts and menu actions
feat: Implement global settings menu action navigation to settings page
feat: Implement theme switching functionality with keyboard shortcut and menu action
* code review fixes
2024-08-26 15:24:44 +02:00
Caleb Owens
3170042895
Merge pull request #4754 from gitbutlerapp/Use-correct-sides
...
Use the auto-resolution if the head is conflicted
2024-08-26 15:11:08 +02:00
Caleb Owens
ca0ece9d49
Use the auto-resolution if the head is conflicted
2024-08-26 15:05:36 +02:00
Kiril Videlov
3d61b7a088
Merge pull request #4751 from Byron/gpg-improvements
...
make GPG related spawn failures even clearer (#4750 )
2024-08-26 11:15:17 +02:00
Yerke Tulibergenov
417a0241ce
update git2-hooks to 0.3.3
2024-08-25 23:25:45 +01:00
Sebastian Thiel
1520a4b7a3
make GPG related spawn failures even clearer ( #4750 )
...
This should help self-disagnose probelms aroung GPG not being found.
2024-08-25 09:18:33 +02:00
Kiril Videlov
2ddb032ebf
show relevant commit refs if feature is toggled
2024-08-23 21:03:44 +02:00
Kiril Videlov
33e7d7b269
adds the ability to create branch refs from the UI
2024-08-23 18:07:24 +02:00
Caleb Owens
fdcbae3250
Merge pull request #4746 from gitbutlerapp/UI-lib-updates-#5
...
UI lib updates #5
2024-08-23 16:37:39 +02:00
Pavel Laptev
681d118a1f
icon prop fix
2024-08-23 16:25:32 +02:00
Pavel Laptev
9ffe096323
badge component modified
2024-08-23 16:20:57 +02:00
Caleb Owens
ef92f4d991
Merge pull request #4747 from gitbutlerapp/css-variable-auto-complete
...
Have CSS variables auto-complete
2024-08-23 16:08:45 +02:00
Caleb Owens
16ebe5d81e
Have CSS variables auto-complete
2024-08-23 16:06:57 +02:00
Pavel Laptev
2b5b5c00aa
remove unused code
2024-08-23 15:49:49 +02:00
Comnir
da0c623e06
Add back some imports...
2024-08-23 16:43:56 +03:00
Pavel Laptev
964f700f04
update FileListItem and FileIcon components
2024-08-23 15:42:00 +02:00
Caleb Owens
74a5c1a2ae
Merge pull request #4742 from gitbutlerapp/Exit-edit-mode-without-saving
...
Exit edit mode without saving
2024-08-23 15:33:53 +02:00
Comnir
ca8bf2e400
Fix conflicting-branches list message
...
- Currently no branches are listed
- The branches list returned by update_base_branch contains string, whereas when the message is constructed it's assumed the objects in the list have a 'name' property
2024-08-23 16:20:33 +03:00
Kiril Videlov
4668a1ec3d
update create and update reference apis
...
No need to provide the change_id as it can be obtained from the commit itself
2024-08-23 14:32:31 +02:00
Sebastian Thiel
ca62ac8893
Merge pull request #4744 from Byron/git2-to-gix
...
better rev-walk in branch listing
2024-08-23 13:48:02 +02:00
Kiril Videlov
7137fce76e
add ui feature flag for branch stacking
2024-08-23 13:46:17 +02:00
Caleb Owens
680efe0900
Merge pull request #4743 from gitbutlerapp/Fix-wdio-and-tsconfig-errors
...
Fix wdio and tsconfig errors
2024-08-23 13:23:10 +02:00
Sebastian Thiel
7ee0520ffb
Use latest rev_walk() based API.
...
It's a bit more intuitive than `id().ancestors()` when coming from `git2`.
2024-08-23 13:08:37 +02:00
Sebastian Thiel
47916d8b41
use the latest gix from GitHub with latest improvements
2024-08-23 13:08:37 +02:00
Caleb Owens
dd84ad168c
Fix wdio and tsconfig errors
2024-08-23 12:56:24 +02:00
Caleb Owens
04a63f1712
Exit edit mode without saving
2024-08-23 12:47:17 +02:00
Nico Domino
26c67530f6
chore: bump turbo@2.0.15-canary.1 ( #4727 )
2024-08-23 11:47:41 +02:00
Nico Domino
d15ccc95f0
fix: add linux dependencies to tauri.conf ( #4741 )
2024-08-23 11:13:00 +02:00
Pavel Laptev
7ce3f35c12
Added to UI: FileIcon
2024-08-23 00:05:03 +02:00
Kiril Videlov
aea72e8605
update any branch references during cherry rebase
2024-08-23 00:03:58 +02:00
Pavel Laptev
f8f20c2604
refactor: Change FileListItem story title to 'Misc / FileListItem' instead of 'Elements / FileListItem'
2024-08-22 23:35:00 +02:00
Kiril Videlov
12f826b9ad
move the stacking impl to repo crate
...
There is just too big of a dependency in both directions to be able to have a separation at this time. The gitbutler-repo crate is needed for the stacking functionality and the `rebase` module inside of it needs to use the new API in order to maintain consistency during rebasing.
2024-08-22 23:29:13 +02:00
Kiril Videlov
9d6508b849
support listing references by commits
2024-08-22 23:21:26 +02:00
Pavel Laptev
29f9d3fb9d
casing issues fixes
2024-08-22 20:24:02 +00:00
Pavel Laptev
f93cec81dd
feat(ui): add FileListItem component and Storybook story
2024-08-22 22:19:23 +02:00
Pavel Laptev
18570f36ba
rename stories
2024-08-22 22:08:28 +02:00
Pavel Laptev
bbb2db580c
Badge styles update
2024-08-22 21:58:41 +02:00
Pavel Laptev
f05cca3572
button types import moved
2024-08-22 21:57:40 +02:00
Caleb Owens
ec7a38f538
Merge pull request #4717 from gitbutlerapp/Rebase-revolution
...
Rebase revolution
2024-08-22 18:28:49 +02:00
Caleb Owens
553ca5846f
correct lifetime names
2024-08-22 18:16:16 +02:00
Caleb Owens
893b3fc499
Use a default variant on enum
2024-08-22 18:04:11 +02:00
