Sebastian Thiel
cdf508e04c
Show what changed to get the version we currently have
...
This reverts commit 547f2ffada
2024-05-24 15:44:13 +02:00
Sebastian Thiel
547f2ffada
re-add original code to see what changed
2024-05-24 15:42:17 +02:00
Sebastian Thiel
6596f3956e
adapt debouncer tests with the changed codebase
2024-05-24 15:38:46 +02:00
Sebastian Thiel
edd8d54950
copy tests from notify-debouncer-full as well (verbatim)
...
While at it, remove the docs as they are referring to the original source code.
Tests should help to understand how it is supposed to work.
Note that the copy is verbatim and modifications will happen in a separate commit,
along with the necessary license declarations.
2024-05-24 13:50:03 +02:00
Sebastian Thiel
86edb4627d
reorganize watcher modules for more consistency
2024-05-24 13:28:34 +02:00
Sebastian Thiel
80b9598d5a
remove (some) unused code; minor refactor
2024-05-24 13:28:33 +02:00
Sebastian Thiel
2080b62864
add license for code taken from notify-debouncer-full
2024-05-24 13:19:37 +02:00
Sebastian Thiel
5906eb1a35
change debounce-events to trace so they don't dominate the log
...
Ideally it's usable even in debug mode.
2024-05-24 12:41:26 +02:00
Kiril Videlov
2ecee6df21
Merge pull request #3846 from gitbutlerapp/sc-fix-rebase-issue
...
Return the merge result in the case the rebase bails
2024-05-24 11:02:33 +02:00
Scott Chacon
c58719b77d
oops.
2024-05-24 10:45:54 +02:00
Kiril Videlov
9db262936c
Merge pull request #3845 from gitbutlerapp/update-base-branch-anyhow
...
feat: Update base branch handling to use anyhow
2024-05-24 10:44:54 +02:00
Scott Chacon
757a4690ca
return the merge result in the case the rebase bails
2024-05-24 10:38:48 +02:00
Kiril Videlov
d5ff348a21
feat: Update base branch handling to use anyhow
2024-05-24 10:31:43 +02:00
Kiril Videlov
af8133ef5c
Merge pull request #3843 from gitbutlerapp/add-oplog-snapshot-details
...
snapshotting in 2 steps - prepare & commit
2024-05-24 00:49:19 +02:00
Kiril Videlov
3749bcef51
snapshot before comitting is done in two steps now
...
this way we have the commit id
2024-05-24 00:35:31 +02:00
Kiril Videlov
d25cd4535e
prepare a snapshot before restoring from a snapshot instead of after
2024-05-24 00:23:34 +02:00
Kiril Videlov
3fef7b5474
support creating snapshots in 2 steps - prepare and commit
...
This allows us to create a snapshot (write the full trees state) first, perform some operations, i.e. the action taken by the user, and then finally commit the oplog.
In some cases we wanna skip comitting the oplog entry if the action done by the user fails. In some cases we might wanna save the error value as snapshot metadata.
2024-05-24 00:16:40 +02:00
Kiril Videlov
f2426fa2a5
Merge pull request #3841 from gitbutlerapp/improve-auto-snapshot-check-performance
...
improve auto-snapshot check performance
2024-05-23 22:50:38 +02:00
Kiril Videlov
be88b2128c
Merge pull request #3842 from gitbutlerapp/snapshot-card-ui-improvements
...
Remove "Current" tag and show restore button on all snapshots
2024-05-23 22:49:42 +02:00
Kiril Videlov
c1c07a4c5a
Remove "Current" tag and show restore button on all snapshots
...
Because snapshots are now created _before_ actions, the one on the top of the list is also undo-able
2024-05-23 22:48:18 +02:00
Kiril Videlov
879005ae20
check lines since snapshot for all dirty branches
...
This is needed because new changes to a file may be locked to a branch which is not the "default" one
2024-05-23 22:37:10 +02:00
Kiril Videlov
db4bb914cc
improve auto snapshotting check performance
2024-05-23 22:17:46 +02:00
Kiril Videlov
c2a5014ed0
oplog state persists timestamp of last snapshot
2024-05-23 22:17:46 +02:00
Pavel Laptev
3e066d4944
"loading more snapshots" state ( #3839 )
2024-05-23 21:54:56 +02:00
Mattias Granlund
7a4c625781
Set branch/commit stores only once on init
...
- initialse context stores with undefined
- simpler logic for reducing outbound requests/flicker
2024-05-23 19:12:10 +02:00
Mattias Granlund
753f3a2813
Make better tooltip for commit line avatars
2024-05-23 19:06:53 +02:00
Mattias Granlund
afda601f69
Bugfix determining new upstream commits
2024-05-23 19:01:22 +02:00
Mattias Granlund
f4b3dde2e8
Fix upstream commit card rounded corners
2024-05-23 18:37:33 +02:00
Mattias Granlund
4b3ad4bf61
Nit pick a couple of things in the history service
2024-05-23 18:13:41 +02:00
Mattias Granlund
053c5b3c12
Fix bug in parent/child relationship
...
- fixes missing remote -> local root in commit lines ui
2024-05-23 16:14:01 +02:00
Mattias Granlund
3096a23098
run cargo fmt
2024-05-23 15:59:43 +02:00
Scott Chacon
6ccb52bd63
whoops
2024-05-23 15:59:43 +02:00
Scott Chacon
7d6c36f4de
refactor: Replace manual rebase with cherry-rebase function.
2024-05-23 15:59:43 +02:00
Caleb Owens
f6421aab3c
Merge pull request #3830 from gitbutlerapp/core-util-duration-updates
...
Replace integer timestamps with Duration
2024-05-23 15:01:14 +02:00
Caleb Owens
e5474d2efa
Fix JS tests
2024-05-23 14:45:01 +02:00
Caleb Owens
983b2a3101
Merged origin/master into core-util-duration-updates
2024-05-23 14:26:28 +02:00
Caleb Owens
c2a1f6a7e7
Fix various tests
2024-05-23 14:26:16 +02:00
Kiril Videlov
2339be4551
Merge pull request #3827 from Byron/watcher-performance
2024-05-23 14:10:04 +02:00
Caleb Owens
d6cde8d722
Update comment to no longer say seconds
2024-05-23 14:09:27 +02:00
Caleb Owens
b81151c77d
Rename serializer
2024-05-23 14:09:20 +02:00
Caleb Owens
4a7e5f48dd
Merge origin/master into core-util-duration-updates
2024-05-23 14:04:54 +02:00
Caleb Owens
d55260c96a
Use Duration rather than various integer times for time
2024-05-23 14:02:48 +02:00
Kiril Videlov
3ce578cb61
Merge pull request #3829 from gitbutlerapp/move-snapshot-generation-before-the-operations
...
move snapshot generation before the operations
2024-05-23 13:53:46 +02:00
Kiril Videlov
c7aaa1a6b6
fix oplog test
2024-05-23 13:40:53 +02:00
Sebastian Thiel
850045e9d3
Allow to watch multiple directories in case of special setups
...
Like worktrees - these could work now from a watchers perspective.
2024-05-23 13:04:02 +02:00
Sebastian Thiel
9ad010bd0f
Assure we fail gracefully git-dir and worktree-dir are unusual
...
This could be supported, but would require more changes to get right.
For now, fail gracefully instead of failing strangely because we don't
watch everything that needs watching.
2024-05-23 12:55:45 +02:00
Mattias Granlund
9213be55f8
Create shared unknown commits store
2024-05-23 12:24:17 +02:00
Kiril Videlov
1312813051
move snapshot MoveCommit before the operation
2024-05-23 11:59:26 +02:00
Kiril Videlov
55da2e550e
move snapshot UpdateCommitMessage before the operation
2024-05-23 11:58:13 +02:00
Kiril Videlov
7ab0bbb989
move snapshot SquashCommit before the operation
2024-05-23 11:57:34 +02:00
