Commit graph

148 commits

Author SHA1 Message Date
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
Alex Good
20aa4d9bae Merge branch 'master' into more-diffs 2020-02-27 16:42:48 +00:00
Alex Good
6ae761d299 Fix list patch generation 2020-02-27 16:42:32 +00:00
Alex Good
da8e23dd7e Merge branch 'master' into more-diffs 2020-02-26 18:16:36 +00:00
Orion Henry
693aa8a6bb strip out 2020-02-26 13:07:48 -05:00
Alex Good
eccc907cf2 WIP 2020-02-26 18:07:45 +00:00
Orion Henry
0c2152ba57 migrated back to jsvalue::serde - fixed conflicts:[] 2020-02-26 12:29:34 -05:00
Orion Henry
3754e537c4 simple test not passing 2020-02-26 09:30:21 -05:00
Alex Good
f1afb83f7d List insert tests passing 2020-02-26 14:23:57 +00:00
Alex Good
a16c5e02b6 Add elemId to InsertSequenceElement 2020-02-26 13:45:25 +00:00
Alex Good
5eb5329653 Merge branch 'master' into diff-generation 2020-02-25 19:44:18 +00:00
Alex Good
1b73a2a4ac Add some diff generation tests 2020-02-25 19:36:53 +00:00
Alex Good
f45edb3dbe Add conflict generation 2020-02-25 18:53:52 +00:00
Alex Good
cd8af1a10a Run clippy 2020-02-25 18:13:41 +00:00
Alex Good
f2450330d9 Run fmt 2020-02-25 17:55:25 +00:00
Alex Good
fe862a9fe6 Some very simple diffs being generated 2020-02-25 17:54:13 +00:00
Alex Good
bfc89cf0d4 Broken WIP 2020-02-21 14:56:03 +00:00
Orion Henry
ac5e02e63d test cleanup 2020-02-21 09:45:46 -05:00
Orion Henry
ae7884ecdd hand copy some tests from automerge - lets make them pass 2020-02-19 13:28:24 -07:00
Orion Henry
0b760fb21f simple cleanup 2020-02-19 12:52:13 -07:00
Alex Good
28cf791aa7 Add error to backend type signatures 2020-02-15 12:53:04 +00:00
Alex Good
5e5747cc1e First diff generation working 2020-02-15 12:45:18 +00:00
Alex Good
194732d910 Run rustfmt 2020-02-15 11:28:08 +00:00
Alex Good
ca9e2ce429 Move backend into it's own module 2020-02-15 11:27:42 +00:00
Alex Good
cdbb98e080 Move patch into it's own module 2020-02-15 11:25:45 +00:00
Alex Good
79cc50b55e Move core logic into backend crate 2020-02-15 11:22:00 +00:00
Alex Good
ff505e1468 Add deserialization, fixes #2 2020-02-14 19:35:28 +00:00
Alex Good
47904467cd Add serialization tests for diffs 2020-02-14 14:19:19 +00:00
Alex Good
a328b91a18 Move custom serde to separate module 2020-02-14 13:04:54 +00:00
Alex Good
c29992113a Merge branch 'master' into diffs 2020-02-14 12:50:49 +00:00
Alex Good
6a85cbb019 Merge branch 'master' of github.com:alexjg/automerge-rs 2020-02-14 12:50:10 +00:00
Alex Good
1ae9a70109 WIP 2020-02-14 12:50:03 +00:00
Alex Good
3f5dae3249 Merge branch 'master' into diffs 2020-02-14 12:21:55 +00:00
Orion Henry
09c8f1ff76 migrate to serde-wasm-bindgen with result/error handling 2020-02-13 19:31:09 -05:00