dependabot[bot]
e3472b2a0b
Bump openssl from 0.10.64 to 0.10.66 in the cargo group
...
Bumps the cargo group with 1 update: [openssl](https://github.com/sfackler/rust-openssl ).
Updates `openssl` from 0.10.64 to 0.10.66
- [Release notes](https://github.com/sfackler/rust-openssl/releases )
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.64...openssl-v0.10.66 )
---
updated-dependencies:
- dependency-name: openssl
dependency-type: indirect
dependency-group: cargo
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-22 18:13:28 +00:00
Kiril Videlov
07872123e7
Merge pull request #4463 from gitbutlerapp/get-workspace-head-return-early-when-nothign-applied
...
get_workspace_head exit early when there are no applied branches
2024-07-22 11:30:59 +02:00
Kiril Videlov
d8a1b4bc6b
get_workspace_head exit early when there are no applied branches
...
Avoids erroring out
2024-07-22 11:25:02 +02:00
Kiril Videlov
67c2ee7e03
Merge pull request #4462 from gitbutlerapp/branch-removal-update
...
more possible mitigations for the "failed to apply" problemt related to merge conflicts
2024-07-21 22:36:30 +02:00
Kiril Videlov
54ae0cf9e8
more possible mitigations for the "failed to apply" problemt related to merge conflicts
2024-07-21 22:30:24 +02:00
Pavel Laptev
10da0ae567
empty board links fixes ( #4461 )
2024-07-21 22:22:13 +02:00
Kiril Videlov
aa0ec8d256
Merge pull request #4460 from gitbutlerapp/mitigate-conflict-failure-to-unapply
...
possible mitigation for the case when a conflicting branch is incorrectly not unapplied base update
2024-07-21 22:08:52 +02:00
Kiril Videlov
581a793773
possible mitigation for the case when a conflicting branch is incorrectly not unapplied base update
2024-07-21 22:04:46 +02:00
Kiril Videlov
a148f90ccb
Merge pull request #4458 from gitbutlerapp/modularize-virtual.rs---move-and-siplify-status-commit-file-and-hunk
...
modularize virtual.rs - move and siplify status commit file and hunk
2024-07-21 20:24:16 +02:00
Kiril Videlov
ea4f47da1b
get_applied_status returns VirtualBranchFiles instead of a tuple of path and hunks
2024-07-21 20:12:54 +02:00
Kiril Videlov
c25e48877b
move hunk related functions and structs to a module
2024-07-21 18:22:50 +02:00
Kiril Videlov
c2d135872a
rename files module to singular for consistency
2024-07-21 18:09:15 +02:00
Kiril Videlov
880ac13f21
move commit related functions and struct to a module
2024-07-21 18:06:52 +02:00
Kiril Videlov
6e27756098
move file related operations out of virtual.rs
2024-07-21 17:59:17 +02:00
Kiril Videlov
f30cb51540
Merge pull request #4457 from gitbutlerapp/move-tree-writing-out-of-virtual-branch-actions
...
move tree writing out of virtual branch actions
2024-07-21 16:44:54 +02:00
Kiril Videlov
0f00f0425a
move tree writing out of virtual branch actions crate
2024-07-21 16:15:41 +02:00
Kiril Videlov
38e01c931c
rename tree writer functions to be actually descriptive of what they do
2024-07-21 15:59:30 +02:00
Kiril Videlov
4faaf77d08
Merge pull request #4456 from gitbutlerapp/use-virtual-branch-hunk-type-in-virtual
...
make virtual.rs functions operate on VirtualBranchHunk
2024-07-21 15:50:56 +02:00
Kiril Videlov
9b9bd0b2e8
make virtual.rs functions operate on VirtualBranchHunk
...
Instead of the Hunk type from gitbutler_diff
2024-07-21 15:38:46 +02:00
Kiril Videlov
432d38fb79
Merge pull request #4455 from gitbutlerapp/update-svelte-version
...
update svelte version
2024-07-21 13:00:05 +02:00
Kiril Videlov
09f5ed56d8
update svelte version
2024-07-21 12:57:13 +02:00
Kiril Videlov
63863f9de5
Merge pull request #4452 from Byron/fix-4389
...
fix 4389
2024-07-20 23:12:07 +02:00
Kiril Videlov
bcb0916201
Merge pull request #4454 from gitbutlerapp/slightly-refactor-get_applied_status
...
slightly refactor get_applied_status
2024-07-20 23:08:47 +02:00
Kiril Videlov
8bfd897579
rename new_compute_locks function
2024-07-20 23:01:50 +02:00
Kiril Videlov
591552f625
get_applied_status now returns a more clear struct
2024-07-20 23:00:06 +02:00
Sebastian Thiel
5cfa2fd4df
Avoid showing any errors for background fetches
...
Otherwise these could pile up or be distracting.
However, errors should be shown on specific user actions
that allow for modal dialogues.
2024-07-20 22:45:26 +02:00
Sebastian Thiel
af4c70fbbc
propagate fetch-errors explicitly to prevent silent failures ( #4389 )
...
However, some tuning might be desired to prevent showing anything if background-fetches fail,
which might be desirable after all as they don't seem to run with modals enabled.
Also perform minor refactors while at it.
2024-07-20 22:38:25 +02:00
Kiril Videlov
246dd9c379
move get_applied_status to separate module
2024-07-20 22:17:31 +02:00
Kiril Videlov
587915227d
remove redundant function get_status_by_branch
2024-07-20 22:01:46 +02:00
Kiril Videlov
27561fa7b8
simplify get_applied_status function signature
2024-07-20 21:57:45 +02:00
Kiril Videlov
84fda3838a
simplify get_workspace_head signature
2024-07-20 21:48:04 +02:00
Kiril Videlov
4125dcef3b
get remove vbranches list as function parameter
2024-07-20 21:44:20 +02:00
Kiril Videlov
4654529aa9
Merge pull request #4451 from gitbutlerapp/rm-commented-code
...
remove commented out code
2024-07-20 21:39:41 +02:00
Kiril Videlov
e41ff19dc0
remove commented out code
2024-07-20 21:31:52 +02:00
Kiril Videlov
2cf0c9723b
Merge pull request #4450 from gitbutlerapp/fix-listing-of-snapshots
...
fix listing of snapshots
2024-07-20 16:00:34 +02:00
Kiril Videlov
0e9b8c2957
fixes a situation in which listing of snapshots fails
2024-07-20 15:51:46 +02:00
Sebastian Thiel
9f9a0e3d01
Merge pull request #4449 from Byron/fix-4371
...
don't fail hard if there is no project metadata
2024-07-20 15:31:50 +02:00
Sebastian Thiel
a15d4332d7
Ignore failures when sending with Share project data and there is no project data ( #4371 )
...
This seems to be the common case now, but let's keep that option in case that changes.
2024-07-20 15:27:45 +02:00
Kiril Videlov
ea5079b723
oplog - get a workdir tree in a safe manner
2024-07-20 14:31:43 +02:00
Kiril Videlov
18f2eef7b3
Merge pull request #4447 from gitbutlerapp/remove-refs-to-branch-controller
...
remove references to virtual branch controller from event handler
2024-07-20 13:48:50 +02:00
Kiril Videlov
b7e2f60b89
remove references to virtual branch controller from event handler
...
After recent refactors, this state is useless
2024-07-20 13:44:03 +02:00
Kiril Videlov
21e7953ac1
Merge pull request #4442 from Byron/optimize-one
...
optimize `is_commit_integrated()`
2024-07-20 13:35:49 +02:00
Kiril Videlov
603df1c998
Merge pull request #4446 from gitbutlerapp/error-codes-for-commit-failures
...
Adds error codes for commit failures
2024-07-20 13:18:18 +02:00
Kiril Videlov
577d035a64
Merge pull request #4443 from gitbutlerapp/dependabot/cargo/cargo-57db22b3e5
...
Bump gix-path from 0.10.8 to 0.10.9 in the cargo group
2024-07-20 13:17:11 +02:00
Kiril Videlov
5d56427f83
Adds error codes for commit failures
...
This will helps the UI better understand why a commit operation may have failed
2024-07-20 12:54:48 +02:00
Mattias Granlund
02d4d6fb63
Always open markdown links in external browser
2024-07-20 00:03:29 +02:00
Sebastian Thiel
ea37a387b4
optimize is_commit_integrated()
...
- do not repeatedly optain the same state, but cache it
- when doing a merge-check, keep temporary objects in memory only.
2024-07-19 11:14:19 +02:00
dependabot[bot]
8936cced4e
Bump gix-path from 0.10.8 to 0.10.9 in the cargo group
...
Bumps the cargo group with 1 update: [gix-path](https://github.com/Byron/gitoxide ).
Updates `gix-path` from 0.10.8 to 0.10.9
- [Release notes](https://github.com/Byron/gitoxide/releases )
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Byron/gitoxide/compare/gix-path-v0.10.8...gix-path-v0.10.9 )
---
updated-dependencies:
- dependency-name: gix-path
dependency-type: direct:production
dependency-group: cargo
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-19 08:56:28 +00:00
Sebastian Thiel
b0bfdac0fb
Merge pull request #4435 from Byron/resolve-optimization
...
improved `conflict` file handling
2024-07-19 10:54:53 +02:00
Sebastian Thiel
d1089f5d6e
update Cargo.lock with latest gix
...
This was forgotten unfortunately.
2024-07-19 10:44:48 +02:00
