Commit graph

581 commits

Author SHA1 Message Date
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
Alex Good
08bc51ad28 Fix get_missing_changes 2020-03-04 17:19:13 +00: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
alexjg
ffa86bf205
Merge pull request #6 from alexjg/final-impls
Implement remaining methods on backend
2020-03-04 14:38:24 +00:00
Alex Good
3d6a8607fd Add tweaks to WASm interface 2020-03-04 14:38:50 +00:00
Alex Good
2078a59e06 Merge branch 'master' into final-impls 2020-03-02 12:05:25 +00:00
Alex Good
ff79872af3 Run cargo fmt on tests too 2020-03-02 12:05:11 +00:00
Alex Good
10de85993b Merge branch 'master' into final-impls 2020-03-02 12:03:50 +00:00
Alex Good
2ef5d782e3 Run clippy on tests too 2020-03-02 12:03:39 +00:00
Alex Good
4467b0c5be More CI wrangling 2020-03-02 11:55:14 +00:00
Alex Good
e3e4b819d2 More CI wrangling 2020-03-02 11:45:28 +00:00
Alex Good
5cbaf355e2 Attempt fixing clippy for CI 2020-03-02 11:42:06 +00:00
Alex Good
2c2fb9704d Implement remaining methods on backend 2020-03-02 11:35:51 +00:00
Alex Good
aada808bc8 Run rustfmt and clippy 2020-02-29 15:26:38 +00:00
Alex Good
57a93e8db8 Consolidate ObjectState impls 2020-02-29 15:21:03 +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
f9c6aa5073 Correctly support multiple undo/redo operations 2020-02-29 14:59:03 +00:00
Alex Good
78855be049 Run clippy 2020-02-28 17:46:20 +00:00
Alex Good
3fcf08480d Merge branch 'master' into undo 2020-02-28 17:40:45 +00:00
Alex Good
cdbb339920 Redo implemented 2020-02-28 17:26:41 +00:00
alexjg
7118117dce
Merge pull request #4 from alexjg/getpatch
all get_patch tests passing
2020-02-28 16:50:45 +00:00
Orion Henry
9752c7d512 fix bug with list patch after numbers not counting for deleted fields 2020-02-28 11:45:43 -05:00
Alex Good
84929b3620 Undo implemented 2020-02-28 16:18:50 +00:00
Orion Henry
d15d6da00c code cleanup 2020-02-28 11:16:00 -05:00
Orion Henry
072010de6d rustfmt 2020-02-28 09:35:40 -05:00
Alex Good
4e0d0c9ef3 WIP 2020-02-28 13:51:05 +00:00
Alex Good
2fbdc709af WIP 2020-02-28 13:50:48 +00:00
Alex Good
eb2a8aaee7 First stab at undo support 2020-02-28 12:39:03 +00:00
Orion Henry
0fbae3ce81 all get_patch tests passing 2020-02-28 01:12:02 -05:00
Orion Henry
17f886936d unbreak tests 2020-02-27 16:15:54 -05:00
Orion Henry
8f47b8e0cf migrate to new changerequest format 2020-02-27 14:40:55 -05:00
Orion Henry
db9498c91c thorw error on duplicate change 2020-02-27 14:23:22 -05:00
Alex Good
5063335b86 Modify WASM interface to use ChangeRequest for applyLocalChange 2020-02-27 19:19:34 +00:00
Alex Good
f4bd5d1984 Add ChangeRequest and associated serialization logic 2020-02-27 19:17:58 +00:00
Orion Henry
ba937eab6d Merge branch 'master' of github.com:alexjg/automerge-rs 2020-02-27 13:41:16 -05:00
Orion Henry
d79ee1a06c applyLocalChange() v1 2020-02-27 13:41:08 -05:00
Alex Good
39b43477a9 Rename ObjectHistory -> ObjectState 2020-02-27 18:07:50 +00:00
Alex Good
79a6240cbc Remove commented out js in tests 2020-02-27 18:05:20 +00:00
Alex Good
2f0ed3ed09 Fix buggy simplifyDiffs, completing applyChanges implementation 2020-02-27 18:03:48 +00:00
Alex Good
952c4b4030 Add diff simplification 2020-02-27 17:46:18 +00:00
Alex Good
a0807bc2f8 Add delete sequence element test 2020-02-27 17:14:23 +00:00