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
Mattias Granlund
af4833f091
Fix a few bugs
2024-05-23 10:58:59 +02:00
Mattias Granlund
12284f33ca
Fix a bunch of commit lines issues
2024-05-23 10:58:59 +02:00
Mattias Granlund
cd419eca67
Refactor how we merge in commits from branch upstream
...
- send change_id to frontend for `RemoteCommit`
- split up massive function into three
- add a couple of checks to prevent unexpected state
- rebase if force push allowed (needs toggle)
2024-05-23 10:58:59 +02:00
Mattias Granlund
ed14ddf378
Simplify function with ? shorthand
2024-05-23 10:58:59 +02:00
Mattias Granlund
8b7e12e472
Remove explicit error type for merge_virtual_branch_upstream
2024-05-23 10:58:59 +02:00
Sebastian Thiel
a83e6809ab
Only open a repository when project-files are involved.
...
There are many filesystem events that are not touching files which
could be ignored.
Now we detect this case in advance and only open the project repository
if we know there are files to check for their ignore state.
That way, there should overall be less IO, which is good for performance
particularly on Windows.
2024-05-23 10:50:38 +02:00
Sebastian Thiel
83d65b8b20
Merge pull request #3826 from Byron/upgrade-gix
...
upgrade `gix` to v0.63
2024-05-23 10:49:49 +02:00
Sebastian Thiel
e3b8e2a5e5
fix: assure commit.gpgsign is detected correctly
...
Avoid stringly comparison for what is definitely a boolean
[as per the configuration](https://git-scm.com/docs/git-config#Documentation/git-config.txt-commitgpgSign ).
2024-05-23 10:18:35 +02:00
Sebastian Thiel
93508d7e7c
fix: assure tests aren't affected by local configuration
...
Otherwise, tests will pickup global configuration, which can affect them.
For instance, if `core.gpgsign` is true, it will cause commits to be signed
which can be slow, or hang entirely if gpg-agent requests a password.
Note that now there is possibly no tests that validates signing,
and doing so is difficult as it requires gpg and keys to be setup.
2024-05-23 10:12:40 +02:00
Sebastian Thiel
7536431da9
upgrade gix to v0.63
...
It comes with various bugfixes and security improvements.
Admittedly, none of these are currently relevant for GitButler.
It's still a good idea to upgrade as `cargo deny` would have problems
with older versions due to the security advisories that were published
yesterday.
2024-05-23 09:40:05 +02:00
Pavel Laptev
e64e787c64
Fix: close context menu on click outside ( #3825 )
2024-05-23 05:14:59 +02:00
Pavel Laptev
6c4c04c9dc
UI fixes ( #3824 )
...
- content shift fix
- icons updated
- removed `#` from shorten SHA
2024-05-23 05:01:12 +02:00
Kiril Videlov
b8dfcf7a82
Merge pull request #3822 from gitbutlerapp/revert-3820-oplog-diff-optimization
...
Revert "fixes incorrect snapshot diff"
2024-05-23 03:31:00 +02:00
Kiril Videlov
f066d6be20
Merge pull request #3821 from gitbutlerapp/oplog-diff-optimization
...
feat(oplog): Improve `lines_since_snapshot` by using tree-to-tree comparison
2024-05-23 03:18:41 +02:00
Kiril Videlov
651a55d3fb
Revert "fixes incorrect snapshot diff"
2024-05-23 03:17:34 +02:00
Kiril Videlov
c3a18ef2b0
feat(oplog): Improve lines_since_snapshot by using tree-to-tree comparison
...
This fixes an issue where snapshots are auto-created too often erroneously
2024-05-23 02:46:40 +02:00
Kiril Videlov
239eb9a84a
Merge pull request #3820 from gitbutlerapp/oplog-diff-optimization
...
fixes incorrect snapshot diff
2024-05-23 01:23:36 +02:00
Kiril Videlov
3517419090
fixes incorrect snapshot diff
2024-05-23 01:10:28 +02:00
Pavel Laptev
14e05adae6
UX/UI: Move collapse lane into kebab menu ( #3819 )
...
* UX/UI: Move `collapse lane ` into kebab menu
- a few `click` events replaced with `mousedown` in order to invoke actions without confirmation
* header style update
* Context menu item: fix disabled cursor
2024-05-22 18:25:11 +02:00
Kiril Videlov
7259e789e3
Merge pull request #3817 from gitbutlerapp/update-branch-footer-style
...
style: Add text style to BranchFooter component.
2024-05-22 14:45:52 +02:00
Kiril Videlov
de79c024ed
style: Add text style to BranchFooter component.
2024-05-22 14:44:23 +02:00
Kiril Videlov
5006b6019d
Merge pull request #3816 from gitbutlerapp/list-remote-branches-refactoring-fix
...
refactor: Improve error handling in branch_to_remote_branch() and list_remote_branches() functions
2024-05-22 14:35:17 +02:00
Kiril Videlov
9dbebba5df
refactor: Improve error handling in branch_to_remote_branch() and list_remote_branches() functions
2024-05-22 14:20:41 +02:00
Kiril Videlov
660d296745
Merge pull request #3814 from gitbutlerapp/update-change-selected-for-changes-branch
...
fix: Use old branch name instead of selected_for_changes in Snapshot creation
2024-05-22 12:32:46 +02:00
Caleb Owens
8314e24c90
Merge pull request #3813 from gitbutlerapp/fix-doubble-time-issue
...
Fix timestamp compensation
2024-05-22 11:29:07 +01:00
Kiril Videlov
f68ce21962
fix: Use old branch name instead of selected_for_changes in Snapshot creation
2024-05-22 12:20:59 +02:00
Caleb Owens
f2471734b4
Fix timestamp compensation
2024-05-22 12:17:04 +02:00
Kiril Videlov
8a88b26d4e
Merge pull request #3812 from gitbutlerapp/add-reload-functionality-folder-history
...
reload after restoring a snapshot
2024-05-22 12:16:50 +02:00
Kiril Videlov
d792d4fee9
reload after restoring a snapshot
2024-05-22 11:13:18 +02:00
Scott Chacon
cba5b7ca6d
Merge pull request #3788 from gitbutlerapp/show-local-branches
...
show local branches
2024-05-22 11:08:42 +02:00
Caleb Owens
8fa200a217
Merge pull request #3810 from gitbutlerapp/rename-clear-url
...
Rename function to better indicate functionality
2024-05-22 09:59:40 +01:00
Caleb Owens
a0d7ae1445
Rename function to better indicate functionality
2024-05-22 10:53:41 +02:00
Caleb Owens
0ab611fe7b
Merge pull request #3809 from lisiur/master
...
fix: Update cleanUrl method to handle ssh URLs
2024-05-22 09:52:13 +01:00
Scott Chacon
8b7fe790e5
return all local branches as well as remote ones
...
also deduplicate them in the branch listing
2024-05-22 10:45:29 +02:00
