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
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
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
Kiril Videlov
044f427810
rm functions for adding context lines to hunks
2024-04-17 07:23:34 +02:00
Kiril Videlov
45361df57c
rm use_diff_context feature flag from project
2024-04-17 07:17:36 +02:00
Kiril Videlov
6f0fe2afa9
rm uses_diff_context from list vbranches return
2024-04-17 07:14:43 +02:00
Kiril Videlov
0d296bf9f0
remove functions for adding context lines
2024-04-17 07:02:39 +02:00
Kiril Videlov
993c7109b0
remove unused context_lines option struct
2024-04-17 07:00:19 +02:00
Kiril Videlov
0c331ee86a
remove context_lines parameters
2024-04-17 06:59:13 +02:00
Kiril Videlov
15458cb25f
remove use of diff_context feature flag
2024-04-17 06:52:08 +02:00
Pavel Laptev
0b0fe13b5c
Icon button wide prop fix ( #3535 )
2024-04-17 00:00:54 +02:00
Caleb Owens
8e0b775d4b
Update formatting
2024-04-16 21:02:23 +01:00
Caleb Owens
93de2484ed
Merged origin/master into always await promises
2024-04-16 21:02:15 +01:00
Caleb Owens
dac89e41a9
Change over to "always" for return await
2024-04-16 20:11:53 +01:00
Kiril Videlov
5dc744dae2
Merge pull request #3534 from gitbutlerapp/normalize-branch-name
...
fix clippy warning
2024-04-16 19:24:06 +02:00
Kiril Videlov
17ae8eb119
fix clippy warning
2024-04-16 19:11:42 +02:00
Josh Junon
8ae62e3dad
Merge pull request #3532 from gitbutlerapp/fix-copyright
...
happy 2024
2024-04-16 18:30:46 +02:00
Vid Luther
4ff94d9f4a
happy 2024
2024-04-16 18:17:51 +02:00
Josh Junon
2dfe176a42
Merge pull request #3531 from gitbutlerapp/plus-to-underscore
...
change normalization to use underscore instead of plus
2024-04-16 17:51:26 +02:00
Josh Junon
deaddc5b99
change normalization to use underscore instead of plus
2024-04-16 17:50:45 +02:00
Josh Junon
8524f85ef9
Merge pull request #3530 from gitbutlerapp/only-move-if-path-contains-space
...
only move if the path contains a space
2024-04-16 17:27:04 +02:00
Josh Junon
693c72b89a
only move if the path contains a space
2024-04-16 17:26:33 +02:00
Josh Junon
2b6edfea7b
Merge pull request #3529 from gitbutlerapp/fix-release-script-syntax
...
add no-op in release script on windows
2024-04-16 17:03:51 +02:00
Josh Junon
8847681c71
add no-op in release script on windows
2024-04-16 17:03:25 +02:00
Josh Junon
99c6710f1a
Merge pull request #3528 from gitbutlerapp/clear-artifacts-on-sign
...
clear old artifacts on signing machine
2024-04-16 16:58:04 +02:00
Josh Junon
a9c6fa7618
clear old artifacts on signing machine
2024-04-16 16:57:15 +02:00
Josh Junon
039378cdb7
Merge pull request #3526 from gitbutlerapp/fix-devtools-feature
...
fix devtools on release builds
2024-04-16 16:56:15 +02:00
Josh Junon
5d56779271
Merge pull request #3527 from gitbutlerapp/fix-signatures
...
normalize S3 paths, enable additional signature on windows, and include updater bundles
2024-04-16 16:56:01 +02:00
Josh Junon
fa06586cdf
fix devtools on release builds
2024-04-16 16:43:22 +02:00
daniilS
e12e741c2e
Fix typos in "conflict" in error message, comments, and a variable name
2024-04-16 15:40:14 +01:00
Sebastian Thiel
980d5907f9
Attach more information in case diffy::apply() fails ( #3451 )
...
It's made in such a way that strings aren't included, but hashed
to allow a little more insight than would otherwise be possible.
2024-04-16 15:28:14 +01:00
Josh Junon
2754330a4a
normalize S3 paths, enable additional signature on windows, and include updater bundles
2024-04-16 16:22:16 +02:00
Josh Junon
ed7fd43874
Merge pull request #3522 from gitbutlerapp/upload-sig-ci
...
upload *.sig to s3 when publishing
2024-04-16 14:42:54 +02:00
Josh Junon
2fbded31f7
upload *.sig to s3 when publishing
2024-04-16 14:42:08 +02:00
Mattias Granlund
2c7079497b
Refactor test for hunk intersection fn
...
Previous implementation of `joined` would fail this test:
```
st virtual_branches::r#virtual::tests::joined_test ... FAILED
at crates/gitbutler-core/src/virtual_branches/virtual.rs:4139:9:
assertion failed: joined(2, 3, 1, 4)
```
2024-04-16 13:26:28 +01:00
Mattias Granlund
1092d50ddd
Fix hunk locking when default target is different from locked_to
2024-04-16 10:55:17 +01:00
Mattias Granlund
dd755d18ac
Fix bug where occasionally locked commit info is missing
...
- happens when the commit is already pushed
2024-04-16 09:44:36 +01:00
Mattias Granlund
203da38e8b
Add devtools to view menu
2024-04-16 09:07:11 +01:00
Mattias Granlund
e88d6f990a
Fix things that broke tests
...
- also fixes a few incorrect test assertions
2024-04-16 00:09:04 +02:00
Mattias Granlund
f22b824d41
Rename uncommitted_base -> integration_commit
2024-04-16 00:09:04 +02:00
Mattias Granlund
3005c06729
Include context lines in hunk hash
...
- git also uses context lines for identification when applying patches
2024-04-16 00:09:04 +02:00
Mattias Granlund
f4750762ed
Fix unapply_hunk with uncommitted_branch
...
- should have been fixed with the other commands
2024-04-16 00:09:04 +02:00
