Chris Penner
6eddc56818
Commit cabal changes
2022-06-03 15:49:48 -06:00
Chris Penner
8558dacb36
Maybe fix windows failures?
2022-06-03 14:56:11 -06:00
Arya Irani
df33c1e257
add when/Paths_ stuff to every package.yaml target
...
didn't put it into another PR, I'm sorry. But we can cherry-pick this out in a separate PR
2022-06-02 17:10:59 -04:00
Chris Penner
f51ebdc502
Merge remote-tracking branch 'origin/arya/ooo-sync' into arya/ooo-sync
2022-06-01 16:43:17 -06:00
Chris Penner
785e71359e
Extract update names index logic for easier use with sync algorithms
2022-06-01 16:42:54 -06:00
Arya Irani
4e7b4c2a42
tweak fixes
2022-06-01 18:23:14 -04:00
Chris Penner
51677b9a3d
Fix incorrect ToJWT/FromJWT instances for HashJWT
2022-06-01 15:04:03 -06:00
Arya Irani
d6b7323326
Merge branch 'arya/ooo-sync' of github.com:unisonweb/unison into arya/ooo-sync
2022-06-01 09:23:03 -04:00
Arya Irani
f1a6cfb0c0
flushIfReadyToFlush
2022-05-31 19:50:25 -04:00
Mitchell Rosen
12630958b4
wrap a couple output messages (for spaces)
2022-05-31 19:29:15 -04:00
Arya Irani
54f5b0b8a8
fix tryMoveTempEntityDependents differently
2022-05-31 17:55:27 -04:00
Arya Irani
8adb6fde3d
update tryMoveTempEntityDependents
2022-05-31 17:00:11 -04:00
Arya Irani
bd312a74d4
fixing up some sync bugs
2022-05-31 15:23:33 -04:00
Arya Irani
865f0ba6f0
Merge remote-tracking branch 'origin/trunk' into arya/ooo-sync
2022-05-31 12:20:46 -04:00
Chris Penner
f61a4dd208
Add more flexibility in our ability to specify codeservers ( #3081 )
...
* Add explicit types for share host and uri
* Ensure we identify servers correctly
* Remove ability to pass args to auth.login
and remove logic for CodeServers config
* PR feedback: special structure for coderserver URI
* Add port to CodeserverId
2022-05-31 09:56:29 -06:00
Arya Irani
bb254c00a1
fix up tests
2022-05-27 16:42:25 -04:00
Arya Irani
acff5af2be
fix up merge compilation errors
...
and formatting differences
2022-05-27 15:34:50 -04:00
Arya Irani
63fc75416c
Merge remote-tracking branch 'origin/trunk' into arya/ooo-sync
...
# Conflicts:
# codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs
# parser-typechecker/package.yaml
# parser-typechecker/src/Unison/Codebase.hs
# parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
# parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema3To4.hs
# unison-cli/src/Unison/Codebase/Editor/Command.hs
# unison-cli/src/Unison/Codebase/Editor/HandleCommand.hs
# unison-cli/src/Unison/Codebase/Editor/Output.hs
# unison-cli/src/Unison/Codebase/Editor/VersionParser.hs
# unison-cli/src/Unison/CommandLine/OutputMessages.hs
2022-05-27 13:49:34 -04:00
Chris Penner
36b8ac2155
Add "debug.doctor" command for assessing codebase integrity ( #3078 )
...
* Collect and pretty-print errors
* Add debug.doctor command
* Improved formatting
2022-05-27 10:51:01 -06:00
Mitchell Rosen
99075cc4e6
move causalHashToShareHash to common
2022-05-27 11:27:11 -04:00
Mitchell Rosen
c167fcd603
generalize entityToTempEntity
2022-05-27 11:24:47 -04:00
Mitchell Rosen
53156a3008
fix bug in entityLocation
2022-05-27 11:13:08 -04:00
Arya Irani
d9a0ddd2ca
Update lib/unison-prelude/src/Unison/Prelude.hs
...
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
2022-05-27 00:11:04 -04:00
Arya Irani
63ecd5dad4
comment out DownloadEntities
2022-05-26 23:32:52 -04:00
Cody Allen
27cba743c4
Merge pull request #3075 from plumenator/trunk
...
Add examples to `patch`'s help
2022-05-26 21:28:34 -04:00
Chris Penner
d910b1a74d
Allow overriding share host via UNISON_SHARE_HOST env var. ( #3079 )
...
* Allow overriding share host via UNISON_SHARE_HOST env var.
* Use staging share for now.
2022-05-26 17:51:07 -06:00
Arya Irani
5259d1915f
Merge branch 'arya/ooo-sync' of github.com:unisonweb/unison into arya/ooo-sync
2022-05-26 19:47:40 -04:00
Chris Penner
e06d4c1a93
Merge remote-tracking branch 'origin/arya/ooo-sync' into arya/ooo-sync
2022-05-26 17:41:33 -06:00
Chris Penner
d3105991fa
Add traversals for Entity types
2022-05-26 17:41:29 -06:00
Arya Irani
461ac1f992
json instances for DownloadEntitiesResponse
2022-05-26 19:40:30 -04:00
Arya Irani
535b8589b8
download entities
2022-05-26 19:22:26 -04:00
Chris Penner
32f33e0c99
Merge remote-tracking branch 'origin/arya/ooo-sync' into arya/ooo-sync
2022-05-26 16:33:31 -06:00
Chris Penner
5bf8f1c204
Causal hash/branch hash cleanup migration ( #3073 )
...
* Rename Branch.Hash -> Branch.CausalHash for clarity.
* WIP simplifying types for Causals and hashes
* Single type for causal hashes.
* Remove vestigial function
* Clean up some rogue hashes
* Formatting
* Fix tests
* Add namespace hash migration
* Cleanup
* Finish writing migration for bad branches, add some sanity checks too.
* Keep hash_object mappings up to date.
* Working migration
* More checks
* Dependency-order migration WIP
* Finish first draft of crawled migration strategy
* Improve speed and reliability of migration.
* Better migration logging
* Perform integrity checks once after all migrations are done.
* Considerably speed up migration by only re-hashing branches which have
the same causal hash as value hash.
* Clarify migration docs
* Move 'differing causal value hash' check to integrity checks
* Bump schema version for new codebases
* PR cleanup
* Remove commented out migration
* PR feedback cleanup
* Add integrity check for hash_objects.
* Correctly set 'changes' key
* Don't check hash object integrity in migrations
Some codebases (like mine) are borked in this area and we'll need to fix
them later on.
* Correct final migration number
* Check namespace hash even if branch has no children
* Rehash every branch regardless
* Use v4 of base.
2022-05-26 16:20:38 -06:00
Mitchell Rosen
92c5b33841
change upsertEntitySomewhere return type to be more clear
2022-05-26 16:36:17 -04:00
Chris Penner
cc34cb8242
Remove entity type from hashjwt for now.
2022-05-26 14:21:51 -06:00
Chris Penner
cfa6bb4e7b
Merge remote-tracking branch 'origin/arya/ooo-sync' into arya/ooo-sync
2022-05-26 14:20:25 -06:00
Chris Penner
8b96376399
Expose implementations for use in Share server
2022-05-26 14:20:06 -06:00
Mitchell Rosen
aff981335c
use BranchHash / PatchHash where appropriate
2022-05-26 16:05:23 -04:00
Chris Penner
ad4d811388
Add missing error handling
2022-05-26 12:12:05 -06:00
Chris Penner
fd2ab0ac23
Merge remote-tracking branch 'origin/arya/ooo-sync' into arya/ooo-sync
2022-05-26 11:47:47 -06:00
Chris Penner
86c04e6771
Adds ToJWT/FromJWT instances for HashJWT
2022-05-26 11:31:28 -06:00
Mitchell Rosen
6ddf2ee72e
tweak fast-forward path to align with server's expectations
2022-05-26 12:13:57 -04:00
Arya Irani
2743c06edb
fix json instances
2022-05-26 11:28:43 -04:00
Arya Irani
a18ef837c5
add FastForwardPathrequest.expectedHash field
2022-05-26 11:25:15 -04:00
Arya Irani
7af936320a
export HashMismatchForEntity and InvalidParentage
2022-05-26 10:46:54 -04:00
Arya Irani
f789e4310f
reexport Data.Tuple.Only, move entityExists, update Sync error types
2022-05-25 18:18:32 -04:00
Chris Penner
f21ba36720
Fix redundant import
2022-05-25 15:10:18 -06:00
Chris Penner
36546ce56c
Expose Codebase connection
2022-05-25 15:01:15 -06:00
Mitchell Rosen
88ff76e5f1
saveDbBranch
2022-05-19 16:05:03 -04:00
Mitchell Rosen
88abca10ce
hpack tweak
2022-05-19 10:29:07 -04:00
