Caleb Owens
3ee9e2724d
Improve maybe move selection
2024-05-30 17:32:05 +02:00
Kiril Videlov
0e7c430d65
Merge pull request #3905 from gitbutlerapp/handle-merge-commits
...
handle merge commits
2024-05-30 16:46:00 +02:00
Caleb Owens
8e0352235c
Be reactive
2024-05-30 16:40:54 +02:00
Kiril Videlov
8550965d14
oopsie
2024-05-30 16:33:28 +02:00
Caleb Owens
30cc5ba381
Fix the ending end of DnD
2024-05-30 16:23:56 +02:00
Kiril Videlov
3af46b3cae
handle merge commits
2024-05-30 16:23:40 +02:00
Mattias Granlund
ed0663ce10
Fix invalid commit range in blame operation
...
- fixes commit_to_branch related errors
- fixes big performance problem when force push disallowed
2024-05-30 16:15:12 +02:00
Caleb Owens
8103889c75
Fix the starting end of DnD
2024-05-30 15:59:29 +02:00
Kiril Videlov
7c06114ab2
list_remote_commit_files: on merge commit dont show wrong diffs
...
Right now it's not possible to show the correct diff because libgit2 doesn't have a `git diff-tree --cc` equivalent
2024-05-30 15:29:27 +02:00
Caleb Owens
a58df7d508
Merge pull request #3902 from gitbutlerapp/fix-remote-showing-in-sidebar
...
Fix origin/master showing in sidebar
2024-05-30 14:46:38 +02:00
Caleb Owens
1d009d2a3b
Sanitize file preview code
2024-05-30 14:32:57 +02:00
Caleb Owens
251424d567
Fix origin/master showing in sidebar
2024-05-30 13:56:39 +02:00
Kiril Videlov
93d019afce
Merge pull request #3901 from gitbutlerapp/update-reflog-time
...
fixes reflog timestamps
2024-05-30 12:14:21 +02:00
Mattias Granlund
eeb99090ad
Fix incorrect workspace_head during merge conflicts
...
- without this we get an incorrect diff
2024-05-30 12:09:27 +02:00
Mattias Granlund
c2f79818c8
Show PR checks progress as error if any check has failed
2024-05-30 12:07:42 +02:00
Kiril Videlov
06ea63ee7c
fixes reflog timestamps
...
Time stapms are super imporatant for this (thanks @schacon) - without a correct time stamp, the trees will be GC'd
2024-05-30 12:02:30 +02:00
Kiril Videlov
0d2024e7fa
Merge pull request #3896 from gitbutlerapp/remove-git-signature-shell-type
...
remove git signature shell type
2024-05-30 00:03:21 +02:00
Kiril Videlov
c623748b3b
Merge pull request #3894 from PritamSangani/fix-error-message-typo
...
Fix small typo in error message
2024-05-29 23:53:37 +02:00
Kiril Videlov
62a3d02303
remove git::signature shell type
2024-05-29 23:51:26 +02:00
Kiril Videlov
ff9e36fb21
simplify git signature use
2024-05-29 23:37:32 +02:00
Kiril Videlov
8882e8efc0
Merge pull request #3895 from gitbutlerapp/write-tree-onto-tree-using-new-tree-builder
...
remove git::treebuilder in favor of plain git2 builder
2024-05-29 23:15:42 +02:00
Kiril Videlov
8496dbf044
remove git::treebuilder in favor of plain git2 builder
2024-05-29 23:03:25 +02:00
Kiril Videlov
9142e73cb7
Merge pull request #3893 from gitbutlerapp/update-file-mode-for-symlink
...
remove git::FileMode shell type
2024-05-29 22:55:44 +02:00
Pritam Sangani
efc7c4bd64
Add full stop to end of error message to match style of other error messages
2024-05-29 21:46:37 +01:00
Pritam Sangani
e650e041f8
Fix small typo in error message
2024-05-29 21:42:37 +01:00
Kiril Videlov
c3f374af72
remove git::FileMode shell type
2024-05-29 22:42:27 +02:00
Kiril Videlov
4c9fc4d213
Merge pull request #3892 from Byron/oplog-fix
...
assure reflog is recreated if not present even if ref is present
2024-05-29 22:17:14 +02:00
Sebastian Thiel
7f9462a857
refactor CommitExt
...
- remove conflicting `*_gb()` methods as the native ones are easy enough to use
- some minor refactor
2024-05-29 21:47:03 +02:00
Sebastian Thiel
d5708b38bb
assure reflog is recreated if not present even if ref is present
2024-05-29 21:16:52 +02:00
AliReza Taleghani
0072a5c928
Update publish.yaml
2024-05-29 20:10:31 +02:00
Kiril Videlov
51f22273ce
Merge pull request #3890 from gitbutlerapp/remove-obsolete-blob-references
...
feat(git): remove unused Blob type
2024-05-29 18:48:34 +02:00
Kiril Videlov
fb069e5d39
feat(git): remove unused Blob type
2024-05-29 18:14:50 +02:00
Kiril Videlov
1a127dd96e
Merge pull request #3882 from Byron/ops-review
...
oplog review (part 2)
2024-05-29 18:11:07 +02:00
Sebastian Thiel
96dc9d2887
fix oplog-worktree merging
2024-05-29 17:58:54 +02:00
Sebastian Thiel
407ec1427b
Get performance metrics for get_wd_tree()
...
It's a tiny little function, but I think it can be slow
as it could incur a lot of work, scaling up with the size
of the repository, and the amount of untracked data in it.
Let's gather some data.
2024-05-29 17:56:12 +02:00
Kiril Videlov
ea219eedf9
Merge pull request #3889 from gitbutlerapp/remove-commit-reference
...
remove-commit-reference
2024-05-29 17:48:54 +02:00
Kiril Videlov
d3aa5c4908
remove git::Commit wrapper type
2024-05-29 17:35:30 +02:00
Kiril Videlov
45979b4c85
remove usage of git::Commit
2024-05-29 17:33:57 +02:00
Sebastian Thiel
1abb464845
Merge pull request #3885 from gitbutlerapp/rust-remote-tweaks-for-byron
...
Tweaks to remotes code
2024-05-29 15:13:02 +02:00
Kiril Videlov
66379af066
Merge pull request #3887 from gitbutlerapp/remove-git-tree
...
remove git::tree
2024-05-29 14:44:22 +02:00
Kiril Videlov
be149a5569
remove git::Tree in favor of just git2::Tree
2024-05-29 14:30:59 +02:00
Kiril Videlov
9e4bbdedec
remove unused reader functions
2024-05-29 14:04:51 +02:00
Kiril Videlov
d97bba0001
remove git::Tree from branch
2024-05-29 13:24:47 +02:00
Kiril Videlov
3c151a52cb
create a tree extension trait
...
this is useful for preserving functionality that we have added on top of git2::Tree
2024-05-29 11:15:46 +02:00
Caleb Owens
4ba15c3663
Make clippy a happy clippy
2024-05-29 11:14:29 +02:00
Caleb Owens
faa476875d
Replace &BranchId to BranchId
2024-05-29 11:07:36 +02:00
Caleb Owens
0db12b5115
Don't pass references to project_id
2024-05-29 10:47:11 +02:00
Caleb Owens
c5d841a417
Tweaks to remotes code
2024-05-29 09:52:03 +02:00
Kiril Videlov
aed23f3e69
Merge pull request #3884 from gitbutlerapp/remove-core-git-shell-types
...
move get_wd_tree to git2::Repository extension trait
2024-05-28 23:46:43 +02:00
Kiril Videlov
4db276354b
remove unused import
2024-05-28 23:32:33 +02:00
