Kiril Videlov
e82483fb88
get_branch_target returns default on not found
...
Matching the previous semantics
2024-04-19 21:54:24 +02:00
Kiril Videlov
d57cba4d31
migrate base to VirtualBranchState
2024-04-19 21:41:22 +02:00
Kiril Videlov
2c5465639c
migrate repository to VirtualBranchState
2024-04-19 21:40:33 +02:00
Kiril Videlov
c152060cbf
migrate virtual_branches to VirtualBranchState
2024-04-19 21:39:33 +02:00
Kiril Videlov
098e80d484
migrate integration to VirtualBranchesHandle
2024-04-19 20:19:19 +02:00
Kiril Videlov
44faf660c3
separate list_branches and list_branch_ids
2024-04-19 19:53:32 +02:00
Kiril Videlov
4f43d075ee
migrate controller to VirtualBranchesHandle
2024-04-19 19:13:55 +02:00
Kiril Videlov
6383cd0d59
match VirtualBranchesHandle interface with readers
2024-04-19 19:12:44 +02:00
Josh Junon
747527d91d
Merge pull request #3559 from gitbutlerapp/full-menu
...
re-construct the full menu instead of using OS default
2024-04-19 16:18:17 +02:00
Josh Junon
d5b34c46f5
mark package info as potentially unused
2024-04-19 16:01:54 +02:00
Josh Junon
7f35537798
only construct about metadata on macos
2024-04-19 15:49:23 +02:00
Josh Junon
ed088f4431
enable devtools on release builds, too
2024-04-19 15:17:44 +02:00
Josh Junon
340eaeaf8c
re-construct the full menu instead of using OS default
2024-04-19 15:15:56 +02:00
Pavel Laptev
fd622d4e7b
UX: break GitHub Auth into steps, layout update ( #3558 )
...
* UX: break GitHub Auth into steps, UX improve
* refactor: duplicated action removed
* remove unnessesery code
2024-04-19 15:02:19 +02:00
Pavel Laptev
f2e9f801dd
Remove unused CSS classes ( #3557 )
2024-04-19 13:13:35 +02:00
Josh Junon
0a33ac8616
Merge pull request #3554 from gitbutlerapp/run-all-tests-on-workflow-change
...
run all tests on any workflow/actions change
2024-04-18 15:56:17 +02:00
Josh Junon
d091a357be
fix cargo warnings
2024-04-18 15:43:58 +02:00
Josh Junon
450b1aeee9
add rt/macros to tokio in core for tests
2024-04-18 15:26:10 +02:00
Josh Junon
b43fd0849b
run all tests on any workflow/actions change
2024-04-18 15:03:13 +02:00
Josh Junon
89cd57905e
Merge pull request #3553 from gitbutlerapp/fix-core-tests
...
fix tests not running for core
2024-04-18 14:54:51 +02:00
Josh Junon
597dcb3f1e
fix tests not running for core
2024-04-18 14:54:08 +02:00
Josh Junon
8ac5865046
Merge pull request #3550 from Byron/fix-win-build
...
fix build on Windows
2024-04-18 14:36:06 +02:00
Sebastian Thiel
300a90f3cb
let CI run cargo check on the workspace on Windows
...
That way, we will catch basic breakage early.
2024-04-18 14:34:02 +02:00
Josh Junon
43872c208a
Merge pull request #3551 from gitbutlerapp/new-pat
...
switch tokens to Josh
2024-04-18 14:08:09 +02:00
Josh Junon
3aea922afc
switch tokens to Josh
2024-04-18 14:05:45 +02:00
Sebastian Thiel
125b329ab8
fix build on Windows
2024-04-18 13:45:53 +02:00
Kiril Videlov
7fd8b8ee7f
Merge pull request #3549 from gitbutlerapp/Use-toml-vbranches-state-by-default
...
Use toml-vbranches-state by default
2024-04-18 13:25:43 +02:00
Kiril Videlov
0c11a0efcb
use toml vbranch state by default
2024-04-18 13:12:39 +02:00
Kiril Videlov
f7f7ba992b
fix: valid ownership claims in test
2024-04-18 13:12:39 +02:00
Kiril Videlov
d02b0a719f
Merge pull request #3548 from gitbutlerapp/remove-show-file-at-tree
...
remove unused show_file_at_tree
2024-04-18 12:42:08 +02:00
Kiril Videlov
fdee7abe0b
remove unused show_file_at_tree
2024-04-18 12:12:28 +02:00
Josh Junon
db70eed3a8
Merge pull request #3545 from gitbutlerapp/fix-test-fetch-push
...
use more robust askpass frontend handling
2024-04-18 11:45:00 +02:00
Josh Junon
37bacc6ad1
use more robust askpass frontend handling
2024-04-18 11:42:12 +02:00
Kiril Videlov
ce14ea3b0b
Merge pull request #3541 from Byron/watcher-crate
...
split `tauri/watcher` into crate
2024-04-18 11:40:31 +02:00
Kiril Videlov
adbb4d1960
Merge pull request #3546 from Byron/gix-hunks
...
outcome of researching `hunks_by_filepath`
2024-04-18 11:35:53 +02:00
Sebastian Thiel
5d9e593887
refactor
...
- add note related to negative pathspecs and performance implication of the current impl.
- deduplicate code for readability
2024-04-18 11:06:38 +02:00
Sebastian Thiel
c30ac3ba62
optimize tokio features
...
Previously, the attempt was made to enable only those `tokio` features
that are actually used. However, due to default-features still being
enabled and `tauri` using the `full` feature, for most intents and purposes
that wasn't effective.
Now default features are disabled, and `full` isn't used anymore, forcing
all crates to mention the exact features they need.
Note that `tracing` is missing here, as it wasn't effective previously
without the `--cfg tokio_unstable` option also being specified as rustflag.
2024-04-18 09:48:23 +02:00
Sebastian Thiel
adfbc7c5cc
Remove now unused dependencies from tauri.
...
These have moved to `watcher` and `analytics` respectively.
2024-04-18 09:25:33 +02:00
Sebastian Thiel
5785085a77
reintegrate watcher crate into tauri crate
2024-04-17 22:20:32 +02:00
Sebastian Thiel
81dd1fc13e
The watcher-crate compiles and tests run
2024-04-17 21:46:06 +02:00
Sebastian Thiel
143fc05547
add analytics crate based on tauri/analytics
2024-04-17 20:56:04 +02:00
Kiril Videlov
31dd8478ec
Merge pull request #3538 from Byron/worktree-support
...
worktree support
2024-04-17 19:31:51 +02:00
Sebastian Thiel
5223c197d2
add watcher crate with code copied from gitbutler-tauri/src/watcher.
...
It's not functional yet, but exactly at the spot where it needs fixing
across the boundary that is:
- a stand-in for application events
- analytics
2024-04-17 19:15:17 +02:00
Sebastian Thiel
ccbe8fd738
improved error message when worktrees are encountered upon project-add ( #3062 )
...
Note that this is a first step towards making worktree support possible.
2024-04-17 18:37:20 +02:00
Sebastian Thiel
a482473453
add a test to core that should work when worktrees are properly supported ( #3062 )
...
This reproduces #3062 .
2024-04-17 17:32:34 +02:00
Caleb Owens
17d9a1bcdd
Merge pull request #3501 from gitbutlerapp/always-await-promises
...
Always await returned promises
2024-04-17 13:25:05 +01:00
Caleb Owens
8c4ad945dd
Merge branch 'master' into always-await-promises
2024-04-17 13:23:31 +01:00
Kiril Videlov
db5c9a4fcd
Merge pull request #3537 from gitbutlerapp/Virtual-branch
...
update locked hunk tool tip message
2024-04-17 08:36:26 +02:00
Kiril Videlov
b565ec20f0
update locked hunk tool tip message
2024-04-17 08:35:00 +02:00
Kiril Videlov
0d7a0732ca
Merge pull request #3536 from gitbutlerapp/use-context-diff-lines
...
Removes use_diff_context feature flag
2024-04-17 08:10:30 +02:00
