Commit Graph

6666 Commits

Author SHA1 Message Date
Josh Junon
85d045362a
remove useless AsRef impl 2024-05-06 20:07:47 +02:00
Josh Junon
dffca846c4
remove empty else branch 2024-05-06 20:07:42 +02:00
Josh Junon
58f866d588
simplify certain uses of as_ref() in virtual.rs 2024-05-06 20:07:39 +02:00
Josh Junon
d6baf7d8f0
simplify hunk hash diff calls 2024-05-06 20:07:34 +02:00
Josh Junon
21dd4800c3
fix typo: timestam_ms -> timestamp_ms 2024-05-06 20:04:29 +02:00
Kiril Videlov
9ca080c940
Merge pull request #3708 from gitbutlerapp/fix-spinny
fixes a bug where after updating the workspace the app shows infinite…
2024-05-06 18:34:38 +02:00
Kiril Videlov
98e511c459 fixes a bug where after updating the workspace the app shows infinite spinner 2024-05-06 18:20:09 +02:00
Kiril Videlov
0091bfa1eb
Merge pull request #3688 from gitbutlerapp/resolve-large-quantity-of-files-slow-start
Optimize list_virtual_branches
2024-05-06 16:43:30 +02:00
Scott Chacon
d79bf65e51
Merge pull request #3677 from gitbutlerapp/target-branch-selector-fix
initial implementation of different push target
2024-05-06 16:31:01 +02:00
Kiril Videlov
a6e80d9d7f
Merge pull request #3704 from gitbutlerapp/add-workdir-snapshot-details
add-workdir-snapshot-details
2024-05-06 16:08:08 +02:00
Scott Chacon
4ea691a1cd fetch from push remote too 2024-05-06 16:01:06 +02:00
Kiril Videlov
c29440e472 remove files list trailer from snapshot
This info is extracted from the snapshot itself
2024-05-06 15:36:56 +02:00
Kiril Videlov
42d8e6fd5d
show extra snapshot details in ui 2024-05-06 15:34:42 +02:00
Scott Chacon
c3ac916c32 link to cross-repo unified diff on github 2024-05-06 15:30:38 +02:00
Kiril Videlov
b1bb9bf51c
snapshot listing includes stats about the snapshot
inclue files touched as well as lines added and removed
2024-05-06 15:26:44 +02:00
Scott Chacon
46fe51eeda fix rust errors 2024-05-06 14:30:25 +02:00
Kiril Videlov
80a41b5ef0
Merge pull request #3701 from ndom91/ndom91/add-nix-flake
feat: add flake.nix for nix dev
2024-05-06 14:11:02 +02:00
Scott Chacon
ca634807b1
Merge branch 'master' into target-branch-selector-fix 2024-05-06 13:49:27 +02:00
Scott Chacon
344e3d3f38 small rust stuff 2024-05-06 13:44:08 +02:00
Pavel Laptev
358292dc1c
Refactor CSS and code (#3703)
- Modal trigger code refactor
- Unused CSS removed
2024-05-06 13:19:51 +02:00
Josh Junon
83dec79ef0
Merge pull request #3700 from gitbutlerapp/share-debug-info-menu
add help menu handler for debug info sharing and remove panic
2024-05-06 13:11:38 +02:00
Josh Junon
add0a84165
add help menu handler for debug info sharing and remove panic 2024-05-06 12:58:50 +02:00
Josh Junon
cf74b12a3c
Merge pull request #3693 from gitbutlerapp/Help-window-menu
"Help" window menu
2024-05-06 12:37:14 +02:00
Pavel Laptev
53d6e58850
match statement update 2024-05-06 12:24:18 +02:00
Pavel Laptev
81ff230fb7
code review fixes 2024-05-06 12:12:39 +02:00
Pavel Laptev
c14fa2f864
version added 2024-05-06 12:05:50 +02:00
Josh Junon
bb9fb079c4
Merge pull request #3699 from gitbutlerapp/sort-alphabetically
sort project list alphabetically
2024-05-06 11:57:23 +02:00
Josh Junon
574f0142f9
sort projects list alphabetically by title 2024-05-06 11:32:41 +02:00
Caleb Owens
645726ab93 Render files in chunks of 100
Rendering the files in chunks of 100 prevents the UI from completly locking up. It is a little slugish until it finishes rendering (for the same 2 seconds), but is a markable improvement none hte less
2024-05-06 01:44:26 +01:00
Caleb Owens
85e3420f23 Drastically improve render performance
When rendering 1900 odd files, flexbox can cause performance issues due to having to recalculate many times.

I've removed a selection of un-needed flex declarations which has improved perfomrance sugnificantly.
2024-05-06 00:31:11 +01:00
Kiril Videlov
7fdd85f522
Merge pull request #3695 from gitbutlerapp/restore-snapshot-and-refresh
add some details to the undo interface
2024-05-06 00:20:43 +02:00
Kiril Videlov
08eba701fb
add some details to the undo interface 2024-05-06 00:19:22 +02:00
Kiril Videlov
f2b2434d7c
Merge pull request #3694 from gitbutlerapp/refactor-snapshot-functions-as-trait-methods
refactor snapshotting as an Oplog trait
2024-05-05 22:46:08 +02:00
Kiril Videlov
4f1c63ca77
dont error commands on snapshoting erros
If the snapshoting returns an error that should not interfere with the command that the user originally intended to run
2024-05-05 22:34:15 +02:00
Kiril Videlov
5f6ff257d1
refactor snapshotting as an Oplog trait
Implemented on Project
2024-05-05 22:28:12 +02:00
ndom91
214667b17b
Merge branch 'master' into ndom91/add-nix-flake 2024-05-05 22:27:07 +02:00
Pavel Laptev
6d9848e3d7
lint fixes 2024-05-05 22:18:59 +02:00
Pavel Laptev
e38e68477b
lint fixes 2024-05-05 21:57:45 +02:00
Pavel Laptev
043917ad45
Help window menu added 2024-05-05 21:40:06 +02:00
Kiril Videlov
988291886b
Merge pull request #3692 from anaisbetts/ignore-envs
Ignore .env.development and friends
2024-05-05 21:33:54 +02:00
Ani Betts
de2bcdb390 Ignore .env.development and friends 2024-05-05 21:18:05 +02:00
Kiril Videlov
bb1d79e87a
Merge pull request #3691 from gitbutlerapp/added-snapshot-creation-based-on-changed-lines
fix: auto snapshotting on changed lines of code
2024-05-05 20:29:19 +02:00
Kiril Videlov
c59767651d fix: auto snapshotting on changed lines of code
Compare against the last snapshot
2024-05-05 20:08:34 +02:00
Caleb Owens
442ff9dbac Push rather than inserting
This in theory is a faster way of adding items to the list, but at the very least, makes it consistent with the other branch which also uses `push`
2024-05-05 18:07:30 +01:00
Caleb Owens
fc8d8bcb43 Optimize virtual branch file sorting
The changes in this commit optimize the sorting of virtual branch files
by pre-computing the index positions of the ownership claims for each
file path. This improves the performance of the sorting operation by
avoiding the need to repeatedly search for the index positions during
the comparison step.

With 1900 hunks in a vbranch, I've found that this helps reduce the run time from 9 seconds down to just 5.

I considered not sorting at all if we didn't have any branches, but this didn't provide any substantial change in performance.
2024-05-05 18:07:30 +01:00
Kiril Videlov
66a21e8ec5
Merge pull request #3690 from gitbutlerapp/fix-snapshot-path-handling
fix a snapshot bug on windows
2024-05-05 18:09:14 +02:00
Kiril Videlov
9aa7b11311
fix a snapshot bug on windows
paths shouldn't be handcoding the separator
2024-05-05 17:55:10 +02:00
Kiril Videlov
bd33ff1645
Merge pull request #3689 from gitbutlerapp/include-conflict-state-in-snapshots
include conflict state in snapshots
2024-05-05 17:52:47 +02:00
Kiril Videlov
a0a834b8bd
create and restore return the shas of the snapshots 2024-05-05 17:39:45 +02:00
Kiril Videlov
bd8b0bf246
improve docs 2024-05-05 17:32:00 +02:00