Nikita Galaiko
6ce2188142
ownerhip math does not split anymore
2023-06-22 14:16:44 +02:00
Scott Chacon
971059e179
Add basic committing to the client ( #484 )
...
* move commit to virtual_branches code, add bridge for JS
* actually run commit() from the client
* simple remote branches list, for later
* better remote branches
* adds more data to remote branches
* test file movement
* added move_files test and remove path from all branches that match
* fix move with duplicate entries
2023-06-22 09:29:17 +02:00
Nikita Galaiko
e839000a0b
fix butler status
2023-06-22 08:03:09 +02:00
Mattias Granlund
27dd5a6201
Make page load code a bit more succinct
2023-06-21 16:35:26 +01:00
Nikita Galaiko
4722b1ac32
cargo fmt
2023-06-21 16:39:58 +02:00
Nikita Galaiko
17b45c9a8b
test file move
2023-06-21 16:39:58 +02:00
Nikita Galaiko
5be88e8913
remove unused code
2023-06-21 16:39:58 +02:00
Nikita Galaiko
de375879c8
minor rename
2023-06-21 16:39:58 +02:00
Nikita Galaiko
16b98c66d1
use range for the hunk id
2023-06-21 16:39:58 +02:00
Nikita Galaiko
b537aa2bc2
add ownersip math
2023-06-21 16:39:58 +02:00
Nikita Galaiko
d7792a2954
use ownership type
2023-06-21 16:39:58 +02:00
Scott Chacon
7d2f6a4932
remove this duplication ( #493 )
2023-06-21 15:47:29 +02:00
Nikita Galaiko
d64c2b9bef
fix hunk calculation
2023-06-21 15:31:29 +02:00
Kiril Videlov
0570679887
default value if theres nothing?
2023-06-21 15:31:29 +02:00
Scott Chacon
40351431c8
fix hunks
2023-06-21 15:31:29 +02:00
Nikita Galaiko
977c70a802
less dev logs
2023-06-21 13:00:36 +02:00
Mattias Granlund
9b7756b5ce
Change anonymous functions to real functions
...
I have two primary reasons for making this change:
- improve readability by knowing immediately if something is a function
- see function names in stacktraces rather than "anon function"
2023-06-21 11:14:36 +01:00
Kiril Videlov
f2dcf71777
add some placeholders for commiting
2023-06-21 11:36:10 +02:00
Nikita Galaiko
7074f735d7
sanity virtual branch tests
2023-06-21 11:10:18 +02:00
Scott Chacon
c109a91dc5
Merge pull request #481 from gitbutlerapp/sc-vbranch-commits
...
Send mtime with hunk
2023-06-21 10:55:21 +02:00
Scott Chacon
645bef29b6
Merge branch 'master' into sc-vbranch-commits
2023-06-21 10:50:46 +02:00
Scott Chacon
73e9a8ca7c
oops. lint
2023-06-21 10:46:58 +02:00
Scott Chacon
da2ffb795d
send mtime as hunk modified time (I think)
2023-06-21 10:38:37 +02:00
Kiril Videlov
c24f55939b
collapse all hunks
2023-06-21 10:32:17 +02:00
Nikita Galaiko
658df62053
pnpm format
2023-06-21 10:23:07 +02:00
Nikita Galaiko
e3a7c73bfb
branch: types for ownership
2023-06-21 10:23:07 +02:00
Scott Chacon
a4a4fc39a7
fix weird hunk thing
2023-06-21 10:13:44 +02:00
Kiril Videlov
54ca096c32
extract svg from component
2023-06-21 09:52:26 +02:00
Scott Chacon
2f58d4439a
change how we are getting paths
2023-06-21 09:42:07 +02:00
Scott Chacon
1cdd19f073
move files between lanes
2023-06-21 09:42:07 +02:00
Nikita Galaiko
662d40044b
use real function via butler
2023-06-21 09:21:59 +02:00
Nikita Galaiko
1cf2e6af96
handle move files corner cases
2023-06-21 09:21:59 +02:00
Nikita Galaiko
c9c555fa77
simplify diff processing
2023-06-21 09:21:59 +02:00
Nikita Galaiko
36c4ad8673
error handling
2023-06-21 09:21:59 +02:00
Nikita Galaiko
a57dcc7dc3
remove extra fields
2023-06-21 09:21:59 +02:00
Mattias Granlund
d3b08e4a3b
Utility classes for light/dark bg text and border
...
Setting light/dark pairs for each new html component can quickly get a
bit tedious. These utility classes should help reduce that noise.
2023-06-20 19:16:27 +01:00
Nikita Galaiko
ad9a024b7a
butler info
2023-06-20 14:56:50 +02:00
Nikita Galaiko
a674fec718
fix warnings
2023-06-20 14:51:08 +02:00
Nikita Galaiko
ef40ffe35c
remove deltas logic from vbranches
2023-06-20 14:51:08 +02:00
Scott Chacon
e59691d15f
CLI and APIs binary for simple virtual branch manipulation ( #425 )
...
Here we're squash-merging a branch that adds a new cli tool and some basic APIs for manipulating the data format of virtual branches as used by the frontend.
* simple cli for showing data, including vbranches
* can set and show the remote target default
* basic list, new and move in API for frontend
---------
Co-authored-by: Kiril Videlov <kiril@videlov.com>
Co-authored-by: Nikita Galaiko <nikita@galaiko.rocks>
2023-06-20 14:33:02 +02:00
Mattias Granlund
5b4fd4a463
Fix all eslint warnings
2023-06-20 12:13:05 +01:00
Kiril Videlov
a4f2d4604d
hunk summaries are now fetched from the api with local storage cache based on hunk hash
2023-06-20 13:06:38 +02:00
Mattias Granlund
ade9bc6de0
Adding back two-way bindings
...
This will fix correctness issues in the drag & drop experience, but it
also reintroduces performance issues. Picking up a hunk will force
every component on the board to update, trigger all reactive variables.
2023-06-20 11:45:03 +01:00
Kiril Videlov
5090568e4f
Undo changes to differ avoiding player regressions
...
This is no longer used by the vbranch board
2023-06-19 22:38:39 +02:00
Kiril Videlov
386aa130e4
hunk diff viewer specific for vbranches
...
simpler from the player differ since we dont need scrolling and
highlighting
2023-06-19 22:30:15 +02:00
Mattias Granlund
10e5094573
Misc UI related improvements
...
Basing some of the improvements on a screenshot from Ian, and committing
them together to keep things rolling.
2023-06-19 19:59:22 +01:00
Mattias Granlund
4fa1f66976
Make drag & drop behave even better
2023-06-19 16:46:09 +01:00
Mattias Granlund
43309e7849
Make differ only look at its own element
2023-06-19 16:46:09 +01:00
Kiril Videlov
6e527cd69e
test for summarizing hunks from inside the app
2023-06-19 13:53:40 +02:00
Mattias Granlund
561011fff5
Initialise with system theme in Rust code
2023-06-19 12:19:08 +01:00
