Commit graph

694 commits

Author SHA1 Message Date
Orion Henry
dd33e528ab
Merge pull request #20 from automerge/two-level-objtype
Two level objtype
2020-05-26 07:08:00 -07:00
Alex Good
b7527c28eb Stop child IDs which are valid object IDs raising MissingObjectError 2020-05-25 19:24:45 +01:00
Alex Good
baaebef6d1 Merge branch 'master' into two-level-objtype 2020-05-25 18:47:46 +01:00
Orion Henry
ab71d01487 internal types impl COPY 2020-05-25 09:43:28 -04:00
Alex Good
a589689bdb Fix clippy 2020-05-24 11:19:05 +01:00
Alex Good
2443cdf860 Remove objtype wrapper for diffs 2020-05-24 11:06:23 +01:00
Alex Good
40c8f8f9b3 Move ObjType to two level hierarchy 2020-05-24 10:22:18 +01:00
Orion Henry
cbfac9a7b2 clearly show when using external types via amp:: 2020-05-23 12:38:31 -04:00
Orion Henry
a8cb2d805b opid should have an actor not a string 2020-05-23 12:15:53 -04:00
Orion Henry
13142048b1
Merge pull request #19 from automerge/bin_change
Refactor Change to Be Binary Encoded
2020-05-23 08:57:42 -07:00
Orion Henry
20856bfdd9 fmt 2020-05-22 19:22:29 -04:00
Orion Henry
4cc6eb263d remove the unwrap i introduced with ActorID::try_from 2020-05-22 19:22:17 -04:00
Orion Henry
e834abe1f7 remove old crates 2020-05-22 19:16:17 -04:00
Orion Henry
25393130e8 Merge remote-tracking branch 'origin/master' into bin_change 2020-05-22 19:11:52 -04:00
Orion Henry
48dfd6f29a ActorID is now bytes 2020-05-22 19:00:39 -04:00
Orion Henry
87b44cf977 ChangeRequest->Request 2020-05-22 16:11:26 -04:00
Orion Henry
c6ec8515af move OpType and Operation back to Backend 2020-05-22 15:54:14 -04:00
Orion Henry
e9c03ccdaa BinChange is now Change 2020-05-22 15:16:42 -04:00
Orion Henry
a6f1499b2f Change -> UnencodedChange 2020-05-22 15:10:19 -04:00
Orion Henry
92d357efe7 break out change - do some cleanup 2020-05-22 14:57:51 -04:00
Orion Henry
89a1ed46f7 move change back to the backend repo 2020-05-22 13:54:02 -04:00
Alex Good
2567efcc70 Port apply local patch tests 2020-05-22 15:11:42 +01:00
Orion Henry
ad1b1490d8 fmt 2020-05-21 19:05:57 -04:00
Orion Henry
2d31ed09cc canonical BinChange wip 2020-05-21 18:53:07 -04:00
Alex Good
045656ac46 Port the backend concurrency tests 2020-05-21 18:40:36 +01:00
Alex Good
4738e3c52f Run rustfmt and clippy 2020-05-21 13:05:33 +01:00
Alex Good
c1af21e42e Port refuse to overwrite counter 2020-05-21 13:03:19 +01:00
Alex Good
11c9ad9ba9 Port counters inside lists test 2020-05-21 12:57:24 +01:00
Alex Good
425beb2f3f Port counters inside maps test 2020-05-21 12:47:41 +01:00
Alex Good
baf0bc4c0c Port delete in list elements test 2020-05-21 12:11:23 +01:00
Alex Good
42b2c02d3f Port a few more tests 2020-05-21 00:49:55 +01:00
Alex Good
ad6afb9e4d Port the delete keys in map frontend test 2020-05-20 21:25:13 +01:00
Scott Trinh
fb32dac173
protocol: Hex-encode random ActorID (#18)
* protocol: Hex-encode random ActorID

* protocol: Encode UUID bytes directly

* frontend: Remove redundant clone
2020-05-20 19:49:25 +01:00
Alex Good
c918da4d32 Port the update in nested maps frontend test 2020-05-20 18:26:07 +01:00
Orion Henry
1478a3eebc fix my stdout binary ideas 2020-05-19 16:51:31 -04:00
Orion Henry
46d7aeb5a0 more idea tweaks 2020-05-19 16:46:53 -04:00
Orion Henry
1256060458 tweak ideas.md 2020-05-18 13:52:40 -04:00
Orion Henry
6654bb2fed ideas file for cli 2020-05-18 13:41:29 -04:00
Alex Good
67f857f248 Run rustfmt 2020-05-16 02:23:26 +01:00
Alex Good
a4f6020f7c Merge branch 'master' of github.com:automerge/automerge-rs 2020-05-16 02:22:03 +01:00
Alex Good
0e5ce40cff Fix tests 2020-05-16 02:20:52 +01:00
Alex Good
978ab89f59 Add more detail re. performance branch to the README 2020-05-15 14:48:31 -04:00
Orion Henry
26ded9e501 cleanup but git fmt 2020-05-15 14:48:31 -04:00
Alex Good
9bb374b492 Run rustfmt 2020-05-14 01:05:01 +01:00
Alex Good
f8fe19ef08 run clippy 2020-05-14 00:54:06 +01:00
Alex Good
3bfae69e19 Merge branch 'master' into frontend 2020-05-14 00:19:35 +01:00
Orion Henry
ee8505949d more tests in the C api 2020-05-13 16:53:03 -04:00
Orion Henry
df3f4f2eba c interface v2 2020-05-13 15:37:46 -04:00
Alex Good
6fd6d0f839 Port nested state creation test 2020-05-13 19:01:15 +01:00
Alex Good
c415d95c71 Merge branch 'performance' into frontend 2020-05-13 17:53:47 +01:00