Commit Graph

7014 Commits

Author SHA1 Message Date
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
Kiril Videlov
72cdec8c93 move snapshot CherryPick before the operation 2024-05-23 11:56:52 +02:00
Kiril Videlov
e0584534e5 move snapshot UndoCommit before the operation 2024-05-23 11:54:46 +02:00
Kiril Videlov
05039a2bbb move snapshot ReorderCommit before the operation 2024-05-23 11:54:03 +02:00
Kiril Videlov
ff04bc0a59 move snapshot InsertBlankCommit before the operation 2024-05-23 11:53:16 +02:00
Kiril Videlov
168a218ebe move snapshot MoveCommitFile before the operation 2024-05-23 11:52:27 +02:00
Kiril Videlov
f514ec752c move snapshot AmendCommit before the operation 2024-05-23 11:51:18 +02:00
Kiril Videlov
7944fb4558 move snapshot DiscardFile before the operation 2024-05-23 11:50:34 +02:00
Kiril Videlov
6574a805a8 move snapshot DiscardHunk before the operation 2024-05-23 11:50:06 +02:00
Kiril Videlov
a418f22e23 move snapshot UpdateWorkspaceBase before the operation 2024-05-23 11:49:34 +02:00
Kiril Videlov
f94ff8fd41 move snapshot MergeUpstream to before the operation 2024-05-23 11:48:56 +02:00
Kiril Videlov
a65aec6054 move snapshot SetBaseBranch to before the operation 2024-05-23 11:48:00 +02:00
Kiril Videlov
4092464be4 move snapshot UndoCommit to before the operation 2024-05-23 11:46:52 +02:00
Kiril Videlov
77e01b5928 move snapshot CreateCommit to before the operation 2024-05-23 11:45:14 +02:00
Kiril Videlov
89fb842701 move snapshot UpdateBranch to before the operation 2024-05-23 11:39:23 +02:00
Kiril Videlov
753cc02a37 move snapshot UnapplyBranch to before the operation 2024-05-23 11:27:24 +02:00
Kiril Videlov
ea5f8e8dad move snapshot CreateBranch to before the operation 2024-05-23 11:23:37 +02:00
Sebastian Thiel
05118086dd
Use gitoxide in file-watcher
This allows for faster opening times, and more more efficient
exclude checks.
2024-05-23 11:13:56 +02:00
Kiril Videlov
7bd3548030 move snapshot DeleteBranch to before the operation 2024-05-23 11:12:33 +02:00
Kiril Videlov
4e234d6b5c move snapshot ApplyBranch before the operation 2024-05-23 11:07:30 +02:00
Mattias Granlund
2b33b79d48 Fix lint 2024-05-23 10:58:59 +02:00
Mattias Granlund
021180d8f1 Rename function 2024-05-23 10:58:59 +02:00
Mattias Granlund
044f7ae96e Fix push button bug 2024-05-23 10:58:59 +02:00