Scott Chacon
cd2d9f708e
can change your base branch
...
when no vbranches are applied, you can change your base branch
2024-04-30 10:22:29 +02:00
Kiril Videlov
7002becf30
Merge pull request #3633 from gitbutlerapp/add-new-file-logging
...
fix: undo snapshots will disregard files larger than 32MB
2024-04-29 20:42:07 +02:00
Kiril Videlov
0d8b97b36c
fix: undo snapshots will disregard files larger than 32MB
...
Ensuring that a snapshot "undo" does not remove those files
2024-04-29 20:28:27 +02:00
Scott Chacon
a99fd6b066
Merge pull request #3630 from gitbutlerapp/show-uneditable-commit-messages
...
fixes bug with hidden uneditable commit messages
2024-04-29 17:46:23 +02:00
Scott Chacon
698791ba08
fixes bug with hidden uneditable commit messages
2024-04-29 17:34:44 +02:00
Kiril Videlov
27480c503e
Merge pull request #3629 from gitbutlerapp/remove-rust-posthog-integration
...
remove posthog from the rust code
2024-04-29 16:28:11 +02:00
Scott Chacon
786a834559
Merge pull request #3626 from gitbutlerapp/sc-history-manipulation
...
operation tonkotsu 2
2024-04-29 16:17:57 +02:00
Kiril Videlov
00706b402b
remove posthog from the rust code
...
similar to https://github.com/gitbutlerapp/gitbutler/pull/3628
2024-04-29 16:12:14 +02:00
Kiril Videlov
47f37dff42
Merge pull request #3628 from gitbutlerapp/remove-sentry-integration
...
remove sentry from rust code
2024-04-29 16:09:22 +02:00
Kiril Videlov
6439f3333a
remove sentry rust dependencies
2024-04-29 15:54:13 +02:00
Kiril Videlov
83b40eabb6
remove sentry from rust code
...
Since the actually valuable bug reports are submitted by developers as github issues or on our Discord, sentry error reporting is not necessary
2024-04-29 15:46:29 +02:00
Scott Chacon
c5e7fe865c
fix clippy issues
...
fix a few more clippy issues
2024-04-29 15:42:58 +02:00
Kiril Videlov
16398e75f6
Merge pull request #3627 from gitbutlerapp/fix-analytics-early-initialization
...
fix-analytics-early-initialization
2024-04-29 15:31:37 +02:00
Kiril Videlov
4414d29bbf
separate opt-in for non-anonomous telemetry
2024-04-29 15:12:22 +02:00
Scott Chacon
6e0b37a342
frontend code for running various history manipulations
2024-04-29 15:06:13 +02:00
Scott Chacon
2b1d808314
add several history manipulation backend functions
...
this adds backend functions in Rust to do the following:
* move file hunks between commits (basic)
* undo any commit in a stack
* insert a blank commit
* move a commit within the stack
* update a commit message in place
2024-04-29 15:03:01 +02:00
Kiril Videlov
732a196505
fix: dont initialize posthog / sentry analytics before onboarding complete
2024-04-29 14:25:45 +02:00
Kiril Videlov
d6a882b1ba
Merge pull request #3625 from gitbutlerapp/operation-type-refactor
...
feat: Enhance OperationType handling in SnapshotDetails
2024-04-29 12:24:05 +02:00
Kiril Videlov
ae7bb0d2ee
feat: Enhance OperationType handling in SnapshotDetails
2024-04-29 12:08:56 +02:00
Kiril Videlov
7175923f5f
Merge pull request #3623 from gitbutlerapp/snapshot-list-fix
...
snapshot-list-fix
2024-04-28 20:50:59 +02:00
Kiril Videlov
7e11171211
fix: snapshot uses uses gitbutler as comitter
2024-04-28 20:38:34 +02:00
Kiril Videlov
27ce10cdcf
add test asserions for restoring virtual_branches.toml
2024-04-28 20:23:02 +02:00
Kiril Videlov
3be8dd444b
fixes a snapshot restor bug where untracked files arent removed
2024-04-28 20:08:47 +02:00
Kiril Videlov
34d12fb1e6
add snapshotting tests
2024-04-28 20:05:46 +02:00
Kiril Videlov
9b0661e7db
Merge pull request #3622 from gitbutlerapp/update-oplog-and-target-heads
...
feat: Add tests for updating the oplog head and target head
2024-04-28 12:21:34 +02:00
Kiril Videlov
b0e0fc790c
feat: Add tests for updating the oplog head and target head
2024-04-28 12:08:32 +02:00
Kiril Videlov
ca33269197
Merge pull request #3621 from gitbutlerapp/set-target-ref-to-oplog
...
test: Add tests for set_reference_to_oplog function
2024-04-27 23:56:40 +02:00
Kiril Videlov
6ff0d551eb
fix test
2024-04-27 23:43:25 +02:00
Kiril Videlov
d65f723ec0
test: Add tests for set_reference_to_oplog function
2024-04-27 23:27:39 +02:00
Kiril Videlov
470f89de01
Merge pull request #3620 from gitbutlerapp/add-windows-fs-write-support
...
skip tempfile under windows
2024-04-27 18:39:59 +02:00
Kiril Videlov
8b0dd6cc21
skip tempfile under windows
2024-04-27 17:15:08 +02:00
Kiril Videlov
15bce07c2a
Merge pull request #3619 from Byron/no-tempfiles-on-windows
...
sync-all on Windows
2024-04-27 16:37:28 +02:00
Sebastian Thiel
4f58883bd4
try to fix regression on Windows due to tempfiles semantics ( #3601 )
...
Until `perist()` is truly atomic also on Windows, and modelled
[after Git](https://github.com/git/git/blob/master/compat/mingw.c#L2159-L2209 ),
sans the retries, it seems to work to just perform ordinary writes.
Before going there though, we try to call `sync_all()` on Windows to truly
finish the operation. On Unix, a rename is already supposed to be atomic.
2024-04-27 16:11:28 +02:00
Sebastian Thiel
91d892882e
Deduplicate all 'write' code
...
GB writes files atomically and in the end it boils down to allocating bytes
and writing them all at once.
Now this capability lives in the `fs` module.
2024-04-27 16:11:27 +02:00
Kiril Videlov
415d090d37
Merge pull request #3618 from gitbutlerapp/undo-snapshots-add-types
...
undo snapshots - add types
2024-04-26 23:51:32 +02:00
Kiril Videlov
88c5fa249b
updated ui structs for snapshots
2024-04-26 23:34:09 +02:00
Kiril Videlov
9d534b09ca
snapshots - read full commit meesage
2024-04-26 23:33:39 +02:00
Kiril Videlov
5420fc3e3c
use new snapshot types
2024-04-26 23:20:31 +02:00
Kiril Videlov
371a944e71
add types for the different kinds of snapshots
...
Serializing and deserializing snapshot trailers
2024-04-26 22:35:09 +02:00
Pavel Laptev
06240b3e78
CSS: Button and Tag fixes ( #3616 )
2024-04-26 16:08:13 +02:00
Pavel Laptev
720dbfc875
Small CSS Updates ( #3615 )
...
* badge changes
* fix branches dragging
2024-04-26 13:45:35 +02:00
Josh Junon
847f820922
Merge pull request #3613 from gitbutlerapp/mod-rs-single-file
...
move multi-file modules to mod.rs and single-file modules to <name>.rs
2024-04-26 12:09:39 +02:00
Josh Junon
adcba68220
move multi-file modules to mod.rs and single-file modules to <name>.rs
2024-04-26 11:56:35 +02:00
Sebastian Thiel
9ca8f45a68
Merge pull request #3597 from Byron/copy-less
...
use iterators and avoid copies
2024-04-26 07:21:30 +02:00
Sebastian Thiel
a08e2be07e
OwnershipClaims now allocates less
...
This is done by allowing to take (rust) ownership where internally
the item is consumed.
2024-04-26 07:08:43 +02:00
Sebastian Thiel
6c90381bcf
Use iterators for transformation, and avoid copies by default.
2024-04-26 07:08:41 +02:00
Sebastian Thiel
9dddd77899
Make it more obvious to devs how to make core tests pass.
...
Now a binary is required which might not always be present, nor is
it created as pre-requisite of the test.
Until that is the case, say how this can be fixed.
2024-04-26 07:07:44 +02:00
Mattias Granlund
a91153aff3
Fix lock tooltip closure shadowing commit variable
2024-04-26 00:06:01 +02:00
Mattias Granlund
311a582a8c
Minimise range in double lock test
...
todo: figure out why we can't use only three lines in this test
2024-04-26 00:06:01 +02:00
Mattias Granlund
c5c2df1b93
Surface warning if hunk locked to multiple branches
...
- now returning `HunkLock` to front end
- detect if locked to more than one branch and warn user
2024-04-26 00:06:01 +02:00
