Mattias Granlund
252ac974be
Fix bug preventing file context menu to open
...
- was happening for selected items
2024-11-04 23:34:34 +01:00
Sebastian Thiel
0b32618d74
Use gitoxide in is_remote_branch_mergeable()
...
Unfortunately it doesn't seem to be called from the UI anymore, just in tests,
so there isn't any benchmark results.
2024-11-04 20:05:47 +01:00
Sebastian Thiel
922bdd9334
Replace merge-tree in upstream_integration_statuses
2024-11-04 19:55:18 +01:00
Caleb Owens
72fe2556a7
Merge pull request #5432 from gitbutlerapp/fix-getting-stuck-in-onboarding
...
Fix getting stuck in onboarding
2024-11-04 19:18:22 +01:00
Caleb Owens
645845720b
Fix getting stuck in onboarding
2024-11-04 18:56:14 +01:00
Esteban Vega
1fcf6a4763
Merge pull request #5428 from gitbutlerapp/e-branch-3
...
fix: Hunk dependencies account for complete overwrite
2024-11-04 18:44:33 +01:00
Kiril Videlov
589bbb2392
Merge pull request #5421 from gitbutlerapp/refactor-virtual-branch-commit
...
Remove files from VirtualBranchCommit struct
2024-11-04 18:42:31 +01:00
Caleb Owens
596c60cbbc
Fix select many casing
2024-11-04 18:12:27 +01:00
Mattias Granlund
36c620414f
Remove files from VirtualBranchCommit struct
...
- loaded separately in the client
2024-11-04 18:06:18 +01:00
Mattias Granlund
eea3e13244
Add From impl for FileDiff -> RemoteBranchFile
...
- eliminates some code duplication
2024-11-04 18:05:31 +01:00
Mikael Carpenter
b311bd841d
refactor: bring back the pre and ensure it wraps
2024-11-04 17:52:49 +01:00
Mikael Carpenter
afca5c5b45
fix: move errorMessage to the content slot
...
Text wasn't wrapping, but this looks a little more idiomatic for this codebase given how the InfoMessage component is used
2024-11-04 17:52:49 +01:00
ndom91
829163411e
fix: Tauri v2 linux dependencies
2024-11-04 17:40:20 +01:00
estib
b38839f5ed
fix: Hunk dependencies account for complete overwrite
...
Handle the computation of dependencies when a patch overrides a hunk completely.
Also handle the cases of determining the intersection of changes when deleting complete files
2024-11-04 17:26:39 +01:00
Caleb Owens
75cbc282a8
Use HTMLElementTagNameMap for createElement
2024-11-04 16:53:28 +01:00
Caleb Owens
2d4937a6b9
Remove unrequired onDestroy hook
2024-11-04 16:52:10 +01:00
Caleb Owens
4e735be872
Use once rather than manually removing event listener
2024-11-04 16:51:45 +01:00
Sebastian Thiel
7357d94bae
Add integrate-upstream subcommand
2024-11-04 16:03:13 +01:00
Caleb Owens
6212b43d3d
Remove seemingly unused event listner remover
2024-11-04 13:41:07 +01:00
Sebastian Thiel
5ac5937f24
gitoxide merge-trees for checkout_branch_trees().
2024-11-04 12:11:34 +01:00
Caleb Owens
34ac6a8db4
Move chips code about
2024-11-04 12:08:30 +01:00
Mattias Granlund
b269bbf08f
Fix performance problem with file drag & drop
...
- fixes manual use of a svelte action
- pass store to DraggableFile instead of updating selection list
- refactor file selection
2024-11-04 11:46:32 +01:00
Sebastian Thiel
9706c9006e
Use gitoxide for oplog listing
2024-11-04 10:41:38 +01:00
Kiril Videlov
d763258bc8
Adds a method commits to Branch
2024-11-03 22:57:07 +01:00
Kiril Videlov
a9cb841717
Merge pull request #5419 from gitbutlerapp/kv-branch-2
...
Remove unnecessary field remote_commit_ids_by_change_id
2024-11-03 20:46:28 +01:00
Kiril Videlov
51c36128ce
Remove unnecessary field remote_commit_ids_by_change_id
2024-11-03 20:37:27 +01:00
Sebastian Thiel
6ef051ee30
Replace merge-trees in oplog to use gitoxide.
2024-11-03 20:27:08 +01:00
Sebastian Thiel
e3a701b7d6
add snapshot diff to the CLI
2024-11-03 19:56:27 +01:00
Sebastian Thiel
4c3db04e06
Use gitoxide when merging trees in go_back_to_integration().`
2024-11-03 19:56:21 +01:00
Sebastian Thiel
fc52951c32
add branch set-base as a way to go back to the integration branch
2024-11-03 19:56:21 +01:00
Sebastian Thiel
01216278c8
unapply_ownership uses gitoxide merging.
...
Note that this at best is done for getting better merge results, it's not significant
for performance.
2024-11-03 19:56:11 +01:00
Sebastian Thiel
6a80637864
add unapply-ownership command for lack of association with a resource.
...
It's definitely a debugging and profiling tool, nothing more.
2024-11-03 19:56:11 +01:00
Sebastian Thiel
48b3f9ca21
Use gitoxide merge-trees for when applying and unapplying branches.
...
While at it, check make it a thing to check for clean merges easily.
2024-11-03 19:56:09 +01:00
Kiril Videlov
c9005523c9
Merge pull request #5415 from gitbutlerapp/kv-branch-2
...
fix(stack): branch_base takes commit id directly
2024-11-03 14:03:40 +01:00
Kiril Videlov
4e3eabfad7
fix(stack): branch_base takes commit id directly
...
Using change ID for the merge base is not relevant
2024-11-03 13:57:18 +01:00
Kiril Videlov
8fe38eadd7
Merge pull request #5414 from gitbutlerapp/minor-stack-refactor
...
Renames PatchReference to Branch and other minor stack refactors
2024-11-03 13:41:40 +01:00
Kiril Videlov
64c28d7008
Fix a bug in commit_by_oid_or_change_id
...
It now correctly finds the commit if it happens to be the merge base and is referenced with changeID instead of commitID
2024-11-03 13:29:27 +01:00
Kiril Videlov
49ef4d5d27
Introduce a branch_base method on Stack for discovering the base of a branch
2024-11-03 12:53:12 +01:00
Sebastian Thiel
650c13611b
Add branch apply go GitButler CLI
...
This will help measuring the performance changes during apply and unapply operations.
2024-11-03 12:42:23 +01:00
Kiril Videlov
64cba8ebfc
Rename type PatchReference to Branch for clarity
2024-11-03 12:16:45 +01:00
Kiril Videlov
3a383e19bd
Merge pull request #5386 from gitbutlerapp/kv-branch-1
...
Fixes a bug where incorrect remote commits are shown when remote was rebased
2024-11-03 00:33:17 +01:00
Kiril Videlov
e3b647b073
Merge pull request #5411 from gitbutlerapp/performance
...
use gitoxide for merging trees
2024-11-02 21:25:30 +01:00
Sebastian Thiel
e4079e5578
avoid duplicate MD5 hash generation
2024-11-02 19:54:08 +01:00
Sebastian Thiel
4c8d270d8a
Use gitoxide or is_integrated().
...
This is the most expensive call as it's possible to trigger a lot
of merges.
Also improve performance by aborting the merge as early as it's
known that there is a conflict.
2024-11-02 19:23:53 +01:00
Sebastian Thiel
7327a5791b
Use the latest version of gitoxide with support for merging trees.
2024-11-02 15:25:50 +01:00
Sebastian Thiel
e8071419b0
remove ineffective diff options when diffing trees.
...
These options were related to the worktree, which won't take part in this
kind of diff.
2024-11-02 15:20:56 +01:00
Sebastian Thiel
69979807fe
The UUID crate always needs V4, so have that feature in the workspace.
...
Some crates use it from the workspace as if it had that feature,
but the reason they compile is only due to compiling a crate higher
up that sets the feature, which transitively affects the crate in question.
When building `gitbutler-diff` for instance, the build will fail.
2024-11-02 14:48:18 +01:00
Kiril Videlov
2ba4cb2e77
Merge pull request #5410 from gitbutlerapp/move-patch-reference-to-stack-crate
...
Refactor: move patch reference structs to the stack crate
2024-11-02 14:11:06 +01:00
Kiril Videlov
736ef0d648
Refactor: move patch reference structs to the stack crate
...
The separation no longer makes sense
2024-11-02 13:24:53 +01:00
Kiril Videlov
9ae182fac7
Merge pull request #5409 from gitbutlerapp/kv-branch-2
...
Stack - small refactors
2024-11-02 13:09:26 +01:00
