Commit Graph

8725 Commits

Author SHA1 Message Date
Comnir
da0c623e06 Add back some imports... 2024-08-23 16:43:56 +03: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
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
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
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
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
Caleb Owens
c987629262 Add project specific setting and refactor 2024-08-22 17:57:03 +02:00
Pavel Laptev
21eeb5f5c9
minor UI lib updates (#4740)
* button icons change

* Shorter copy

* checkbox updated to Svelte 5

- added `Checkbox` story

* Fix checkbox and badge props

* change story name

* segement color transition update

* illustrations update

* update SVG illustration colors

* style: Update button CSS variables for different button styles.
2024-08-22 15:39:09 +02:00
Caleb Owens
b45a52f111 Remove empty merge commits 2024-08-22 15:27:34 +02:00
Caleb Owens
0603fd7457 Sure up behaviour with blank commits and reordering 2024-08-22 15:15:23 +02:00
Mattias Granlund
8a741bcf2e Delete entry from .toml file when branch is integrated
- virtual_branches.toml file was full of old entries
2024-08-22 13:46:55 +01:00
Mattias Granlund
9c100fca49 Visually distinguish draft prs in branch list 2024-08-22 13:46:33 +01:00
Nico Domino
0342a46560
fix: invalid CSP syntax (#4739) 2024-08-22 12:26:19 +00:00
Nico Domino
51139b4d73
fix: zoom shortcut codes for international keyboard users (#4735) 2024-08-22 10:45:34 +01:00
Mattias Granlund
191dc073e8 Improve app drag areas
- drag from lane gutters (but not over scrollbar)
- drag from empty space in new branch dropzone
- drag from empty space
2024-08-22 00:23:52 +01:00
Sebastian Thiel
be4ddb1fe1
Merge pull request #4670 from Byron/git2-to-gix
branch details with `gix`
2024-08-21 20:56:38 +02:00
Sebastian Thiel
fcafaec2be
process merge-bases in the background
This way, only the first branch has to wait, all further branches will
likely have their merge-base already computed then.
2024-08-21 20:24:22 +02:00
Sebastian Thiel
bdd109047e
use latest gix APIs for more convenience and increased readability. 2024-08-21 19:28:12 +02:00
Sebastian Thiel
e78ef9b115
enable max performance to be competitive in object database access.
This is very relevant for tree-diffing performance, and more could be tuned
here like pack-cache sizes and object cache sizes.
2024-08-21 19:28:12 +02:00
Sebastian Thiel
66c747e611
somewhat fix the ODB performance bottleneck with better caching. 2024-08-21 19:28:12 +02:00
Sebastian Thiel
a2382bde74
Use gix to find branchs and get the local tracking branch 2024-08-21 19:28:12 +02:00
Sebastian Thiel
29ecbff318
Use gix for tree-tree-diff 2024-08-21 19:28:12 +02:00
Sebastian Thiel
0db0f1a86a
Use gix for simple ref-walk that won't go past the merge-base. 2024-08-21 19:28:12 +02:00
Sebastian Thiel
db600b48f9
add benchmark just for revwalking 2024-08-21 19:28:11 +02:00
Sebastian Thiel
42e4ab44f9
Make it more obvious where gitoxide repositories are used. 2024-08-21 19:28:11 +02:00
Sebastian Thiel
7362bab7aa
Assure we can use different merge bases when showing branch details.
Alternatively, correct the assumption that there is a difference.
2024-08-21 19:28:11 +02:00
Sebastian Thiel
07dc9efe02
add tests for get_branch_listing_details() 2024-08-21 19:28:11 +02:00
Sebastian Thiel
e26bf2f54a
add benchmarks for branch details 2024-08-21 19:28:09 +02:00
Sebastian Thiel
7c768acf4d
Add list-all subcommand
This lists all branches that the user would see (and get details for).
2024-08-21 19:23:43 +02:00
Sebastian Thiel
96e0d3e83f
add --trace to enable tracing
This is useful to get simple performance metrics.
2024-08-21 19:23:42 +02:00
Sebastian Thiel
77cbc50a68
branch listing and branch details for the CLI 2024-08-21 19:23:42 +02:00
Sebastian Thiel
d1fdcde139
minor refactor 2024-08-21 19:23:42 +02:00
Sebastian Thiel
84b2db9685
optimize git2 for good measure, and enable them from tauri and cli 2024-08-21 19:23:42 +02:00
Sebastian Thiel
c58112f157
Use latest gix from main 2024-08-21 19:23:42 +02:00
Mattias Granlund
acf902c2e6 Fix applied -> in_workspace performance issue
- loop was taking > 1s for me
- my 8 branches (2 in workspace) were constantly being saved
2024-08-21 16:11:26 +01:00
Mattias Granlund
c968a1049c
Merge pull request #4671 from Comnir/delete-project-when-backing-from-adding-project
fix: clicking 'Cancel' on new project page does nothing
2024-08-21 14:36:50 +01:00
Caleb Owens
ace6facb24 Getting behaviour locked in 2024-08-21 14:45:41 +02:00
Pavel Laptev
d56973a56e Update AppUpdater.svelte
- update copy
- show the `tick` icon if the app is "UPTODATE"
- fix the background for the loading scale
- don't show the slide animation if the app is "UPTODATE" or "ERROR"
2024-08-21 12:40:08 +01:00
Mattias Granlund
132336c1da Add AppUpdater component test 2024-08-21 12:40:08 +01:00
Mattias Granlund
caae223b1f Fix checks monitor test
- these tests can't be run concurrently apparently
2024-08-21 12:40:08 +01:00
Mattias Granlund
ed6ecf183f Add test to ensure continous update polling 2024-08-21 12:40:08 +01:00
Mattias Granlund
4a2e947c46 Simplify and test updater service
- reverts to old UI
- moves more business logic into .ts file
- add tests for a few scenarios
2024-08-21 12:40:08 +01:00
Mattias Granlund
086d0cb0fb Fix branch re-ordering
- lets svelte re-order visually rather than manipulating the dom
2024-08-21 11:31:25 +01:00
Nico Domino
3ce2b5b338
fix: avatars from Google accounts via Auth0 (#4725) 2024-08-21 11:06:52 +02:00