Sebastian Thiel
3723cd279c
enable rename-tracking by FileId by configuring the cache.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
a63b88669c
revert from original to modified version
...
This shows the exact changes that were done to the original.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
05d3ef3308
make the original version compile and pass tests, assure it works in-app
...
For the first time, we also add an extra root to the FileId cache which was
unusable before due to the missing configuration.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
3eaaa7f62d
revert debouncer to original version from 0.3.1
...
That way it becomes obvious which changes exactly are needed to make
the flush-functionality working.
This commit will be followed up by a revert to get the flush-changes
back.
2024-06-16 09:38:23 +02:00
Sebastian Thiel
659fc99af0
remove duplicate tests (but keep them as unit-tests this time)
...
Previously the `DebouncerInner` struct was made public to allow the
tests to happen (they initialize it directly), but to keep it closer
to the original, let's keep unit tests this time.
Also I validated that both tests are the same.
2024-06-16 09:38:17 +02:00
Kiril Videlov
81f683777e
Merge pull request #4091 from gitbutlerapp/workdir-tree-function
...
improve performance of workidir diff
2024-06-16 02:40:33 +02:00
Pavel Laptev
dafc6330aa
Merge pull request #4092 from gitbutlerapp/Tokens-update-1
...
Update tokens
2024-06-16 02:19:16 +02:00
Kiril Videlov
64729a9a17
improve performance of workidir diff
2024-06-16 01:54:23 +02:00
Pavel Laptev
30880d49e7
Handle loading and disable states for large projects ( #4090 )
...
* UI: Fix show spinner icon for the loading state
* UI: Disable actions while waiting for response
* UI: Button spinner updated
2024-06-16 01:26:55 +02:00
Pavel Laptev
9b527c49c0
Update tokens
2024-06-16 00:24:13 +02:00
Pavel Laptev
d5b8afc991
UI: Update "fold" navigation button ( #4089 )
2024-06-15 23:43:59 +02:00
Pavel Laptev
ff6e145476
UI tweaks ( #4088 )
...
* Tokens update
* History error style changed
* Button icons style update
* Filter button update
* rebase icon update
* Navigation "fold" button updated
2024-06-15 23:36:28 +02:00
Kiril Videlov
41c2ab5908
Merge pull request #4086 from gitbutlerapp/add-mempack-backend-reset-oops
...
feat: Add in-memory method to open temporary repository for comparing or getting diffs.
2024-06-15 21:49:15 +02:00
Kiril Videlov
4963ca7d9a
Merge pull request #4087 from gitbutlerapp/remove-conflict-resolution-code
...
refactor: Remove commented-out code for conflict handling in virtual branches.
2024-06-15 21:48:57 +02:00
Kiril Videlov
be975b7038
refactor: Remove commented-out code for conflict handling in virtual branches.
2024-06-15 21:36:56 +02:00
Kiril Videlov
b01f35bf26
feat: Add in-memory method to open temporary repository for comparing or getting diffs.
2024-06-15 21:21:11 +02:00
Pavel Laptev
6f5b08f391
Close the History view on Esc ( #4079 )
2024-06-13 15:10:08 +02:00
Pavel Laptev
a7579306b4
Color tokens updates ( #4077 )
...
* Color tokens update
* formatting
* styles upd: account link and commit card divider
* replace color mix CSS functions
* Button icon opacity update
* border color 2 update
* fix neutral and ghost text colors
* neutral tokens tweak
* color tokens tweak
2024-06-12 22:52:04 +02:00
Mattias Granlund
0399f983b5
Fix a couple of issues in commit lines
...
- local line was not using the `.first` class
- `localIn` prop must be undefined if first
- simplify and fix "out type" calculation
2024-06-12 00:56:22 +02:00
Mattias Granlund
650a463a16
Fix empty commit marked as integrated
...
- we can't say an empty commit is integrated based on tree ids
2024-06-11 23:38:51 +02:00
Mattias Granlund
18566eb3e4
Don't show option to discard changes in unapplied branch
2024-06-11 21:43:04 +02:00
Kiril Videlov
8c710398dd
Merge pull request #4073 from gitbutlerapp/perf-oplog
...
improve oplog snapshot creation performance
2024-06-11 21:02:20 +02:00
Kiril Videlov
a5f3649654
remove repeat tree creation when history is being listed
2024-06-11 20:05:13 +02:00
Kiril Videlov
119107c12b
getting the snapshot diff uses workdir from applied vbranches
2024-06-11 19:51:36 +02:00
Kiril Videlov
8e8a0ffce7
list snapshots uses workdir tree from applied vbranches
2024-06-11 19:09:45 +02:00
Mattias Granlund
7ae018c21e
Fix: add some missing highlight props to select components
2024-06-11 18:26:11 +02:00
Kiril Videlov
f36be87f8a
add the ability to get workdir tree from merging all applied virtual branches from a snapshot
2024-06-11 17:07:04 +02:00
Mattias Granlund
bd33a2c831
Fix new branch dropzone active state css
2024-06-11 16:35:37 +02:00
Mattias Granlund
8e8ef037cb
Bug fix for push button
...
- fixes case where button had label "undefined"
- "integrate upstream" instead of "rebase branch"
2024-06-11 16:24:21 +02:00
Kiril Videlov
c15125833d
performance: creating an oplog entry does not save a workdir tree
...
We are already storing the virtual branch trees separately, and merging them together can be a slow operation if the index is large.
2024-06-11 13:21:51 +02:00
Nico Domino
62c312ce96
fix: toggles on preferences form ( #4063 )
2024-06-11 11:32:36 +02:00
Mattias Granlund
10de79a0b0
Hide error div in toast when no error present
...
Slots cannot be conditionally filled, so we either need an if statement switching between two `<InfoMessage>` components, or pass error as a prop.
2024-06-10 23:32:47 +02:00
Mattias Granlund
f2da13ea83
Fix github auth
...
- no longer shows incorrect error message on success
2024-06-10 22:43:59 +02:00
Kiril Videlov
ea31b78f6a
Merge pull request #3992 from estib-vega/select-input-improvements
...
Select input improvements: Arrow navigation & text filtering
2024-06-10 18:00:54 +02:00
Caleb Owens
c2b4314082
Merge pull request #4057 from gitbutlerapp/update-contextmenu-selection-store-2
...
update-contextmenu-selection-store-2
2024-06-10 17:32:38 +02:00
Caleb Owens
6d07690508
Loop over methods
2024-06-10 17:31:06 +02:00
Caleb Owens
9e89c6a48b
Make em propper buttons
2024-06-10 17:14:01 +02:00
Mattias Granlund
d5e369ff59
Remove rxjs from context menu component
2024-06-10 16:20:51 +02:00
Caleb Owens
63036a80b2
Merge pull request #4054 from gitbutlerapp/diff-the-correct-way-round
...
Diff the correct way round
2024-06-10 15:32:47 +02:00
Caleb Owens
a4f548e411
Diff the correct way round
2024-06-10 15:20:28 +02:00
Caleb Owens
848fabdbe5
Merge pull request #4053 from gitbutlerapp/Remove-console-log
...
Remove console.log
2024-06-10 14:53:42 +02:00
Caleb Owens
67a8884d2a
Remove console.log
2024-06-10 14:51:58 +02:00
Kiril Videlov
316fe6e0a0
Merge pull request #4051 from gitbutlerapp/sort-hunks-by-start
...
apply hunks in one go for submodules too
2024-06-10 14:32:16 +02:00
Caleb Owens
586889973a
Merge pull request #4052 from gitbutlerapp/Fix-key-for-only-deletions
...
Fix key for only deletions
2024-06-10 13:42:27 +02:00
Caleb Owens
61ede7a55b
Show local commit shas
2024-06-10 13:41:00 +02:00
Caleb Owens
d9beea9c21
Fix keys for only deletions
2024-06-10 13:38:02 +02:00
Kiril Videlov
88e13bd89e
apply hunks in one go for submodules too
2024-06-10 11:23:36 +02:00
Nico Domino
0c481feb28
fix: refactor Modal rendering and clickOutside handling ( #4035 )
2024-06-10 11:11:59 +02:00
Pavel Laptev
1c9a41e20e
css fix: fix height on bas commit hover ( #4050 )
2024-06-10 00:41:48 +02:00
Pavel Laptev
1421fc0020
UI: commit card update ( #4043 )
...
* UI: commit card update
- move "open" commit button
- do not display details if it's empty
- styles tweaking
* "edit message" modal width update
* Styles: fix for the "merge commits" disclaimer
* copy update
* commit card subtitle update
* Merge conflict resolve
* new "Insert empty commit" button
* add `extendWithClass` to draggable + drag handle
- In order to modify the draggable clone with an extended class if needed
* typo fix
* icon `undifined` class fix
* added drag handlers
* drag handle style update
* formatting
* linter warnings fix
* UI styles: context menu paddings
2024-06-09 23:56:39 +02:00
