Nikita Galaiko
bc978f6e38
Merge pull request #1387 from gitbutlerapp/Add-test-for-update-base-branch
...
move more apply branch tests to integration
2023-10-16 15:41:59 +02:00
Nikita Galaiko
3a85984e51
remove debug logs
2023-10-16 15:34:19 +02:00
Nikita Galaiko
c896d2b8f2
correctly handle empty file diffs
2023-10-16 15:30:24 +02:00
Nikita Galaiko
3e575482a9
fixup
2023-10-16 15:15:29 +02:00
Nikita Galaiko
9f83b61b2b
move more apply branch tests to integration
2023-10-16 14:44:09 +02:00
Nikita Galaiko
a33857534d
Merge pull request #1386 from gitbutlerapp/Refactor-add-wd-path
...
do not use project_repository index while flushing
2023-10-16 13:33:42 +02:00
Nikita Galaiko
10adaa4593
do not use project_repository index while flushing
2023-10-16 13:25:42 +02:00
extrawurst
ae3a6f3ebe
feat: add flush_vbranches method to Controller struct ( #1383 )
...
* feat: add flush_vbranches method to Controller struct
The `flush_vbranches` method has been added to the `Controller` struct. This method allows flushing virtual branches as a tree for a specific project. It iterates over the virtual branches of the project and calls the `flush_vbranch_as_tree` function to flush each virtual branch. This method is used in the `Handler` struct to flush virtual branches for a project before flushing the session.
* cleanup error handling
* make controller async for consistency and block on the caller site
2023-10-16 11:18:01 +00:00
Nikita Galaiko
8dacd371a0
Merge pull request #1385 from gitbutlerapp/Refactor-test-file-read
...
revert alternates remove
2023-10-16 13:17:48 +02:00
Nikita Galaiko
008d7e7236
revert alternates remove
2023-10-16 13:09:07 +02:00
Nikita Galaiko
7c0b9a2150
Merge pull request #1384 from gitbutlerapp/Fix-build-session-tree-function
...
don't reference alternate odb when flushing session
2023-10-16 12:49:12 +02:00
Nikita Galaiko
228224f170
cargo fmt
2023-10-16 12:29:46 +02:00
Nikita Galaiko
bf9d9d499d
don't reference alternate odb when flushing session
2023-10-16 12:10:49 +02:00
Nikita Galaiko
37e6b9d87b
Merge pull request #1382 from gitbutlerapp/use-prebuilt-svelte-store-dependency
...
use prebuilt svelte-store dependency
2023-10-16 11:09:53 +02:00
Nikita Galaiko
e1a9ce1fba
use prebuilt svelte-store dependency
2023-10-16 11:03:24 +02:00
Kiril Videlov
31ab4c6fca
🎨 style: update commit reset button appearance and add tooltip
2023-10-16 09:36:10 +02:00
Kiril Videlov
d6edbc2187
🔧 fix: update connect-src CSP directive to include api.github.com for additional API endpoint access
2023-10-16 09:35:06 +02:00
Kiril Videlov
a2b699700b
🔨 chore: update commit reset button tooltip to remove warning about force push
...
The tooltip breaks the layout here for some reason
2023-10-16 09:27:56 +02:00
Kiril Videlov
53116d4740
🔧 fix: add Content Security Policy (CSP) for dev mode too
2023-10-14 20:03:23 +02:00
Kiril Videlov
53186737d5
🔧 fix: update CSP img-src to allow loading images from GitHub avatars
2023-10-14 20:03:00 +02:00
Nikita Galaiko
884ca537f9
Merge pull request #1373 from gitbutlerapp/Virtual-branch-2
...
make clippy check test code
2023-10-13 16:12:10 +02:00
Nikita Galaiko
cff22fbc66
fixup
2023-10-13 15:54:16 +02:00
Nikita Galaiko
de4942c945
fix clippy in tests
2023-10-13 15:33:18 +02:00
Kiril Videlov
f608758eae
fix formatting
2023-10-13 15:20:32 +02:00
Kiril Videlov
8f7bcac403
✨ feat: add support for creating pull requests and pushing commits with the option to create a pull request
2023-10-13 15:20:32 +02:00
Nikita Galaiko
eb17137bf2
make clippy check test code
2023-10-13 14:54:44 +02:00
Nikita Galaiko
04b9f7bd8b
Merge pull request #1364 from gitbutlerapp/Add-id-module
...
Add id module
2023-10-13 13:14:01 +02:00
Nikita Galaiko
b9b14bb921
resolve conflicts
2023-10-13 13:07:30 +02:00
Nikita Galaiko
45daddeaa3
more clippy fixes
2023-10-13 12:56:33 +02:00
extrawurst
9ead8a6133
align the context/error handling add_disk_alternate
2023-10-13 12:50:59 +02:00
Nikita Galaiko
8accaa1fec
typed virtual branch id
2023-10-13 12:50:05 +02:00
extrawurst
71010d24f7
extract tree flushing to reuse in flush_session ( #1357 )
2023-10-13 12:01:16 +02:00
extrawurst
977d441250
add local rust checks script
...
to simulate as much of the ci pipeline as possible
2023-10-13 11:53:06 +02:00
extrawurst
cf1bdabc82
update a bunch of crates, leaving tantivy for now as it breaks the build
2023-10-13 11:38:01 +02:00
Nikita Galaiko
a589b934a2
clippy fixes
2023-10-13 11:07:38 +02:00
extrawurst
8bd5772918
pin resolver version on workspace level to have deterministic build behaviour
2023-10-13 11:06:20 +02:00
Nikita Galaiko
00a631fd2d
merge upstream
2023-10-13 11:03:16 +02:00
Nikita Galaiko
276e2d5b4f
typed project id
2023-10-13 11:00:00 +02:00
Nikita Galaiko
6cac02fccc
typed session ids
2023-10-13 09:48:24 +02:00
Mattias Granlund
5dc19be8fe
Fix the rewind functionality
...
- Shift+Cmd+R when viewing virtual branches to switch to rewind
- Same combo to switch back to virtual branches
- Not everything is great, but it's a start
2023-10-12 21:27:40 +02:00
extrawurst
885a69f8f0
check if the config allows for cloud sync ( #1352 )
...
* check sync config at places of triggers and only error out in fetch if sync is off and fetch event was triggered
* added tests
2023-10-12 18:46:49 +02:00
Kiril Videlov
d338808518
🔨 chore: make placement configurable for floating actions component
2023-10-12 17:30:30 +02:00
Nikita Galaiko
8bba4766ef
Merge pull request #1356 from gitbutlerapp/Add-setup-function
...
conflicts tests & fixes
2023-10-12 15:51:47 +02:00
Nikita Galaiko
8a19c3550e
type assert
2023-10-12 15:45:29 +02:00
Nikita Galaiko
cba2d2fc4f
hide some methods under #cfg(test)
2023-10-12 15:35:50 +02:00
Nikita Galaiko
878c23c229
remove duplicated tests
2023-10-12 15:14:02 +02:00
Nikita Galaiko
93d8128301
better tests for conflict resolution
2023-10-12 15:07:43 +02:00
Nikita Galaiko
5bd549f22c
detect conflict resolution while comitting
2023-10-12 15:07:14 +02:00
Nikita Galaiko
2700be6b50
virtual branches conflict test
2023-10-12 14:25:01 +02:00
Nikita Galaiko
0847685527
Merge pull request #1353 from gitbutlerapp/Virtual-branch-2
...
update integrated separator copy
2023-10-12 13:59:03 +02:00
