Commit graph

712 commits

Author SHA1 Message Date
Alex Good
948ca78a8b Run cargo fmt 2020-04-10 14:36:26 +01:00
Alex Good
5fbc23fd75 Cleanup, add deserialization for DiffLink 2020-04-10 14:36:12 +01: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
7233b23d86 Merge branch 'wip' of github.com:automerge/automerge-rs into wip 2020-04-02 09:41:27 -07:00
Orion Henry
95cb760f79 added clock to patch, some packaging cleanup 2020-04-02 09:39:41 -07:00
Martin Kleppmann
80a2e75e86 Add clock to all patches
Corresponds to automerge/automerge@29f307d2f2
2020-04-02 17:12:35 +01:00
Orion Henry
f9142d6a1a
Merge pull request #11 from ept/wip
Update to match Automerge performance branch
2020-04-02 06:52:17 -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
a85798cb8e try immutable data structures - move serde to its own file 2020-03-31 19:16:46 -07: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
461c970e30 light edits 2020-03-30 16:45:28 -07:00
Orion Henry
f8aa3e2fd5 Reduce memory overhead for versions 2020-03-30 16:04:24 -07:00
Orion Henry
ccd90c1e61 version.rc<op_set> 2020-03-30 15:27:09 -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
f7b3a57d20 handle insert remove properly in diffs - preserve undo stack 2020-03-30 08:42:25 -07:00
Orion Henry
f97e36f770 linked diffs dont need to be remapped 2020-03-29 23:58:23 -07:00
Orion Henry
9ffb4624c1 Noop when deleteing a delete 2020-03-29 23:22:10 -07:00
Orion Henry
7e9b49f4bd Refactor the undo and diffs to be return args instead of pass by mut ref 2020-03-29 23:14:48 -07:00
Orion Henry
09f4e09030 fixed a bug where detached objects would error on diff generation 2020-03-29 22:55:26 -07:00
Orion Henry
319993cd6a add links 2020-03-29 18:35:39 -07:00
Orion Henry
6c0f21e47e elemids not properly deleting 2020-03-29 16:42:15 -07:00
Orion Henry
e24e073c10 code cleanup around diff generation 2020-03-29 15:58:24 -07:00
Orion Henry
853a5223b4 special case to serialize empty diffs 2020-03-29 13:24:24 -07:00
Orion Henry
1c92dc6d24 undo/redo 2020-03-29 10:12:55 -07:00
Orion Henry
8380c6a451 merge cleanup 2020-03-29 07:33:52 -07:00
Orion Henry
058a0f6b3e move op_handle into its own file 2020-03-28 23:42:01 -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
45ecce648d some light cleanup 2020-03-28 16:02:58 -07:00
Orion Henry
9fa6ea8520 combile similar ops when generating a change 2020-03-28 15:48:31 -07:00
Orion Henry
5609c1a3e8 big operation refactor 2020-03-28 14:46:31 -07:00
Orion Henry
899feaefb1 simple refactor - apply_ops 2020-03-28 08:27:11 -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
8ee72ba1e2 flatten out oprequest struct 2020-03-26 07:31:48 -07:00