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
Nikita Galaiko
90124acd1d
update integrated separator copy
2023-10-12 13:57:30 +02:00
Mattias Granlund
b1008356ab
Fix lang/punctuation in delete dialog
...
- should have done this in the last commit
2023-10-12 11:51:59 +02:00
Mattias Granlund
5501509671
Use right font-color for project name when deleting data
2023-10-12 11:23:53 +02:00
extrawurst
fe64ae9db7
fix tests
2023-10-12 11:23:19 +02:00
extrawurst
dd8977a588
write objects path to gb repos alternates file
2023-10-12 11:09:39 +02:00
Nikita Galaiko
3366f24384
Merge pull request #1348 from gitbutlerapp/init-integrations-tests
...
assert error types instead of messages
2023-10-12 11:05:45 +02:00
Nikita Galaiko
3a397c110f
assert error types instead of messages
2023-10-12 10:59:52 +02:00
Nikita Galaiko
8dd6c74e00
Merge pull request #1347 from gitbutlerapp/Virtual-branch-2
...
move tempfile to dev-dependencies
2023-10-12 10:56:20 +02:00
Nikita Galaiko
cc912997d6
sort deps
2023-10-12 10:48:57 +02:00
Nikita Galaiko
4a2db963b4
Merge pull request #1346 from gitbutlerapp/init-integrations-tests
...
init integration tests
2023-10-12 10:45:00 +02:00
Nikita Galaiko
92e28f7588
move tempfile to dev-dependencies
2023-10-12 10:44:49 +02:00
Nikita Galaiko
a71baaacb0
init integration tests
2023-10-12 10:36:48 +02:00
Nikita Galaiko
796a8930f8
Merge pull request #1345 from gitbutlerapp/Fix-reset-head-commit-function
...
resetHeadCommit to handle single commit reset
2023-10-12 08:39:49 +02:00
Nikita Galaiko
f65c5cad21
resetHeadCommit to handle single commit reset
2023-10-12 08:38:22 +02:00
Nikita Galaiko
cafff126f2
Merge pull request #1344 from gitbutlerapp/fix-remote-before-push
...
handle remote is set but not pushed
2023-10-12 08:22:23 +02:00
Nikita Galaiko
bf65ec2d98
handle remote is set but not pushed
2023-10-12 08:16:43 +02:00
Nikita Galaiko
a5d898182a
Merge pull request #1342 from gitbutlerapp/force-pushing
2023-10-11 16:01:07 +02:00
Nikita Galaiko
17f83c5c0c
add a warning tooltip
2023-10-11 15:16:00 +02:00
extrawurst
5e186b580c
add and fix clippy::restrictions lints ( #1341 )
...
left a few as TODO which make sense but pose too much refactoring right now
2023-10-11 15:14:54 +02:00
Nikita Galaiko
ce3bd1521c
use force push when needed
2023-10-11 15:09:04 +02:00
Nikita Galaiko
b834a6ef01
say force push if it's going to happen
2023-10-11 14:46:00 +02:00
Nikita Galaiko
3b5005c865
ui for resetting remote commits
2023-10-11 14:41:33 +02:00
Nikita Galaiko
f7916c7907
add requires_force calculation for vbranch
2023-10-11 14:33:01 +02:00
Nikita Galaiko
be86302d6b
merged upstream (head only)
2023-10-11 14:14:44 +02:00
Nikita Galaiko
e6c5ddfbb4
Merge pull request #1340 from gitbutlerapp/Add-empty-bare-repository-function
...
use a real (though local) remote repository for tests
2023-10-11 14:14:32 +02:00
Nikita Galaiko
36e3a120d6
add missing import
2023-10-11 14:08:59 +02:00
Nikita Galaiko
7bf0252269
add init_bare to repository
2023-10-11 14:02:18 +02:00
Nikita Galaiko
5209ee05a2
fixup
2023-10-11 13:57:48 +02:00
Nikita Galaiko
e3d43eb874
use a real (though local) remote repository for tests
2023-10-11 13:56:46 +02:00
extrawurst
856f9b73c1
Merge pull request #1337 from gitbutlerapp/go-full-on-clippy
...
enable more clippy lints and allow a few that would make our life muc…
2023-10-11 13:27:19 +02:00
