ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
694 commits 52 branches 27 tags 40 MiB
Commit graph

172 commits

Author SHA1 Message Date
Orion Henry
37f8778a81 reorg file for new package 2021-02-18 16:41:20 -05:00
Alex Good
9bfcaea477 Run rustfmt 2021-02-12 12:03:10 -05:00
Orion Henry
6350a8726d trying new ways to package the wasm 2021-02-12 11:49:49 -05:00
Orion Henry
ef38e6d7da getting some WASM errors trying to access crypto in the browser - switching to SmallRng with a 0 seed for now - deterministic distribution of nodes in the skip list should be fine 2021-02-12 11:49:06 -05:00
Orion Henry
f8b6228488 remove js wrapper code and move all module wrapper logic into rust 2021-02-04 16:23:15 -05:00
Alex Good
7cd1a059f5 Add proptest for serialization 2021-01-14 12:30:25 -05:00
Orion Henry
b6d6b66c06 UncompressedChange moved packages 2021-01-14 12:30:25 -05:00
Alex Good
ce38f5360b Move automerge_backend::UnencodedChange -> automerge_protocol::UncompressedChange 2021-01-14 12:30:25 -05:00
Martin Kleppmann
5ec8408398 Replace all-zeros UUID with '_root' 
Corresponding to automerge/automerge@10ec271cbd
 2021-01-12 14:45:32 -05:00
Martin Kleppmann
ec327c0125 Delete unused code 2021-01-12 14:45:32 -05:00
Orion Henry
83145b82c4 add getHeads() and new deps functionality 2021-01-01 17:39:44 -05:00
Orion Henry
f3049202a7 update api to localChange 2020-12-30 15:27:07 -05:00
Orion Henry
b8d71f3b53 remove undo/redo 2020-12-17 19:13:05 -05:00
Orion Henry
939ccf38aa adding ack function 2020-11-12 11:03:44 -05:00
Orion Henry
c2768c5ebc refactor process_request to feed the ops in one at a time removing the 
dobule list management ops
 2020-11-09 09:48:45 -05:00
Orion Henry
26a5d05fe2 copy2 changes 2020-11-09 09:48:45 -05:00
Jeremy Rose
cb33262a34
remove old build scripts (#32) 2020-11-08 14:48:00 +00:00
Jeremy Rose
f80c395434
cargo fmt --all (#30) 2020-11-08 14:47:18 +00:00
Orion Henry
c1319e06eb patch has a slightly different format now 2020-09-09 12:52:25 -04:00
Orion Henry
ab71d01487 internal types impl COPY 2020-05-25 09:43:28 -04:00
Orion Henry
87b44cf977 ChangeRequest->Request 2020-05-22 16:11:26 -04:00
Orion Henry
e9c03ccdaa BinChange is now Change 2020-05-22 15:16:42 -04: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
9bb374b492 Run rustfmt 2020-05-14 01:05:01 +01:00
Alex Good
f8fe19ef08 run clippy 2020-05-14 00:54:06 +01:00
Orion Henry
fb170531d1 Merge branch 'performance' 2020-05-13 12:17:18 -04:00
Alex Good
1839348109 Remove pub export automerge_protocol:{..} from automerge-backend 2020-05-10 14:00:38 +01:00
Orion Henry
c45351b121 first cut of the C api 2020-05-07 07:57:34 -07:00
Orion Henry
bddccbe8fd tests passing for the new deps/hash api 2020-05-05 10:34:18 -07:00
Orion Henry
2c599d49d6 get tests working again 2020-04-27 14:22:04 -07:00
Orion Henry
c7874cc849 encoding in - tests passing 2020-04-27 09:18:48 -07:00
Orion Henry
ba44d3a717 set_stdio 2020-04-21 20:15:56 -07:00
Orion Henry
fa125e94c5 clean up js errors 2020-04-21 13:08:00 -07:00
Orion Henry
eaa023e219 now taking arrays of binary changes as intended 2020-04-21 11:58:07 -07:00
Orion Henry
d855ab9283 decode binary changes 2020-04-21 10:54:25 -07:00
Orion Henry
e3203b24d9
Update GOALS_AND_ISSUES.md 2020-04-16 11:31:08 -04:00
Orion Henry
68c593dda7 cleanup readme 2020-04-16 08:11:12 -07:00
Orion Henry
d2aec176d9 goals and issues markdown 2020-04-16 08:06:24 -07:00
Orion Henry
fe38f41569 integrate skiplist into backend 2020-04-16 06:07:40 -07:00
Orion Henry
50ec30bdba added skip list - not used yet 2020-04-13 20:21:50 -07:00
Orion Henry
94a50fe68a webpack sync inline stuff 2020-04-08 15:33:16 -07:00
Orion Henry
c5916f97b7 start work on async build 2020-04-06 13:43:50 -07:00
Orion Henry
41eea0bb02 grab readme from performance branch 2020-04-05 10:39:42 -07:00
Orion Henry
f37f65dd08 tools for making an asmjs version 2020-04-05 10:22:45 -07:00
Martin Kleppmann
2d7190394d Let the test suite specify the encode/decode functions 
Avoids the code in this repo loading its own version of Automerge, which
may be incompatible with the version run by the test suite (while the
binary data format is in flux)
 2020-04-02 21:38:44 +01:00
Martin Kleppmann
7b51847026 Refactor wrapper to correspond more closely to JS backend 
Corresponds to automerge/automerge@c37cde232a
 2020-04-02 21:19:12 +01:00
Martin Kleppmann
88c96cfc8d Allow building without rimraf dependency 2020-04-02 21:19:12 +01:00
Orion Henry
86844cd43a move files back to old names 2020-04-02 13:12:23 -07:00
Orion Henry
06b234c889 prep for npm package 2020-04-02 12:37:52 -07:00
Orion Henry
4911b5df53 update yarn deps 2020-04-02 09:44:49 -07:00
Orion Henry
95cb760f79 added clock to patch, some packaging cleanup 2020-04-02 09:39:41 -07:00
Martin Kleppmann
74bfee8770 Fix getChanges/getMissingChanges function confusion 2020-04-02 14:48:29 +01:00
Martin Kleppmann
989e9e0e66 Update to match Automerge performance branch 
Intended to go with commit 6c17526cec9712488e8820083bf0cbc5a36fc71e in
the Automerge repo. Currently still throws a lot of errors like:

"serde_json error: invalid type: null, expected a map at line 1 column 4"
 2020-04-02 13:03:46 +01:00
Orion Henry
3642e990e3 some simple optimizations 2020-03-31 15:54:41 -07:00
Orion Henry
af34d7ef36 move undo stack and clock out of opset 2020-03-31 06:49:47 -07:00
Orion Henry
fca6e1c09e move things out of op_set that are not needed 2020-03-30 15:15:30 -07:00
Orion Henry
9eed955d18 keep a cache of elemids in the object 2020-03-30 14:32:38 -07:00
Orion Henry
6c0f21e47e elemids not properly deleting 2020-03-29 16:42:15 -07:00
Orion Henry
7aa7ebe968 light cleanup 2020-03-28 22:44:11 -07:00
Orion Henry
bd338e9ee2 bug in the command compressing code 2020-03-28 21:33:42 -07:00
Orion Henry
d13a859039 light cleanup 2020-03-28 20:19:58 -07:00
Orion Henry
6e76450f5a error on set=null 2020-03-28 18:49:31 -07:00
Orion Henry
b9d003d13d bug in my element iterator 2020-03-28 18:34:06 -07:00
Orion Henry
923b767d0a columner encoding 2020-03-27 08:15:57 -07:00
Orion Henry
1152b6006c break out ObjectID from OpID - implement table obj_id hack 2020-03-26 16:50:26 -07:00
Orion Henry
a0ece5c413 forgot to add helpers 2020-03-25 15:18:22 -07:00
Orion Henry
8139f83dfd fixed increment 2020-03-25 15:09:24 -07:00
Orion Henry
771c6bee18 all backend tests passing 2020-03-25 14:15:23 -07:00
Orion Henry
0a4e28a52d fix deps/pred/insert bugs 2020-03-25 13:13:36 -07:00
Orion Henry
22f06f79c6 get_patch() works 2020-03-24 12:12:51 -07:00
Orion Henry
76491bc07d wip 2020-03-23 21:21:01 -07:00
Orion Henry
2e80b5b3a2 wip 2020-03-23 11:20:10 -07:00
Orion Henry
5ce3a177b1 wip 2020-03-19 14:14:08 -04:00
Orion Henry
7b866b98b9 wip - 7 tests passing 2020-03-17 12:59:08 -04:00
Orion Henry
ce21167174 wip 2020-03-16 15:12:27 -04:00
Orion Henry
d25137875b dont dupe change 2020-03-11 13:45:52 -04:00
Orion Henry
355f1cd5e2 fix transitive deps bug, refactor actor_histories, remove root_value 2020-03-11 11:04:43 -04:00
Orion Henry
00d00f56a9 cleanup Clock 2020-03-05 19:35:19 -05:00
Orion Henry
f663fa9fed update clock func name 2020-03-05 16:19:06 -05:00
Orion Henry
5309b44194 lazy fork, op.cmp(fix) 2020-03-05 14:42:34 -05:00
Orion Henry
420e4e43d2 fix history test 2020-03-05 13:10:15 -05:00
Orion Henry
f3070c0a8c get_missing_deps needs self.actor/seq too 2020-03-05 11:48:32 -05:00
Orion Henry
68048b801c diverge doc, less_or_equal fix 2020-03-05 11:20:12 -05:00
Alex Good
7a532e02f3 Fix tests, formatting, clippy 2020-03-05 11:15:01 +00:00
Orion Henry
2164d6f0d8 lets leak memory!! 2020-03-04 22:31:16 -05:00
Orion Henry
41012d2853 undo/redo stack 2020-03-04 22:21:06 -05:00
Orion Henry
8e63bc798a fix undoable bug, transit-js bug 2020-03-04 20:54:49 -05:00
Orion Henry
0e6f3ab027 replace is_applied 2020-03-04 15:07:18 -05:00
Orion Henry
5ca6f9c9a8 is_applied fix 2020-03-04 14:31:47 -05:00
Orion Henry
662c0bbdb6 toJS on immutable objects 2020-03-04 12:41:03 -05:00
Orion Henry
4a37cd70b9 dont GC state on merge 2020-03-04 12:17:25 -05:00
Orion Henry
1a3d3af655 adding history 2020-03-04 12:10:35 -05:00
Orion Henry
c96a5ff663 rustfmt 2020-03-04 10:17:13 -05:00
Orion Henry
cfd6018b90 use js wrapper 2020-03-04 10:06:49 -05:00
Alex Good
3d6a8607fd Add tweaks to WASm interface 2020-03-04 14:38:50 +00:00
Alex Good
2c2fb9704d Implement remaining methods on backend 2020-03-02 11:35:51 +00:00
Alex Good
8d4eccdf20 Reorder diffs in backend_test.js to reflect order of map iteration in rust 2020-02-29 15:20:35 +00:00
Alex Good
cdbb339920 Redo implemented 2020-02-28 17:26:41 +00:00
Orion Henry
8f47b8e0cf migrate to new changerequest format 2020-02-27 14:40:55 -05:00