ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Commit graph

  • 5a3b767b7b Continue implementing infra Vedant Roy 2021-05-24 00:15:22 -0700
  • 8b74a99b50 Implement basic infra for new C api Vedant Roy 2021-05-22 11:27:59 -0700
  • ef3289da14
         Merge pull request #154 from automerge/msgpack-serde Vedant Roy 2021-05-27 17:18:00 -0700
  • ae3c3cd563 Avoid return Vedant Roy 2021-05-27 17:17:16 -0700
  • 5f7628143d Use return... a bit less Vedant Roy 2021-05-27 16:58:16 -0700
  • f2c0a4953e Report incorrect variant error to serde in RawDiffType::deserialize Vedant Roy 2021-05-27 16:54:34 -0700
  • 623d09d19f Report incorrect variant error to serde in RawOpType::deserialize Alex Good 2021-05-28 00:40:09 +0100
  • 32f0821e0e Make another enum work with msgpack Vedant Roy 2021-05-27 16:33:49 -0700
  • c845351224 Serialize/Deserialize OpType so it works with msgpack Vedant Roy 2021-05-27 15:51:18 -0700
  • 50453bde5c added binary search to doc decode for big speedup Orion Henry 2021-05-27 14:33:47 -0400
  • edf9edd35e
         Simplify apply root diff (#150) Andrew Jeffery 2021-05-26 11:45:30 +0100
  • e7b48fea57 Simplify apply root diff Andrew Jeffery 2021-05-26 11:30:43 +0100
  • 51f50b8f5c
         diffable seq: Avoid rebuilding the updating list each time (#149) Andrew Jeffery 2021-05-26 09:17:08 +0100
  • fc50871b8e
         Merge pull request #148 from automerge/diffable-sequence-remove-unused Andrew Jeffery 2021-05-25 23:25:09 +0100
  • c5dbdda373 diffable seq: Avoid rebuilding the updating list each time Andrew Jeffery 2021-05-25 23:23:20 +0100
  • 949d7b9f62 Remove unused variables Andrew Jeffery 2021-05-25 22:45:36 +0100
  • 837950da35 Satisfy clippy Vedant Roy 2021-05-25 10:00:05 -0700
  • ac080c7b74
         Merge pull request #147 from automerge/sort-pred Andrew Jeffery 2021-05-25 11:40:18 +0100
  • e98ed15582 Sort predecessors during encoding Andrew Jeffery 2021-05-25 10:49:17 +0100
  • a3f7ad79d4 Finish porting C tests Vedant Roy 2021-05-25 00:51:40 -0700
  • 72d15bfe99 a few things broke in the merge Orion Henry 2021-05-24 16:27:05 -0400
  • 8876667a55 Set console_error_panic_hook when initing a backend Andrew Jeffery 2021-05-16 14:48:13 +0100
  • 4e5f1e1451 Dont document cli Andrew Jeffery 2021-05-07 13:44:27 +0100
  • ad30c4ab4c Dont document the C lib Andrew Jeffery 2021-05-07 13:26:57 +0100
  • 2659efc335 Change outdated error message Vedant Roy 2021-05-20 09:54:07 -0700
  • aaccefcb11 Switch back to using Vec<u8> Vedant Roy 2021-05-18 15:32:48 -0700
  • b6db78329a Satisfy clippy Vedant Roy 2021-05-18 14:31:21 -0700
  • bc249bb630 Fix serialization + add test Vedant Roy 2021-05-18 14:28:53 -0700
  • 6539029eaa Add apply_patch test Vedant Roy 2021-05-18 14:00:59 -0700
  • 22af56b059 Internal representation = base64 string Vedant Roy 2021-05-18 13:54:26 -0700
  • 41021f398f Add bytes type Vedant Roy 2021-05-18 13:05:22 -0700
  • 73bc44edbc Add comments from JS version Vedant Roy 2021-05-18 14:58:12 -0700
  • 60c04c13a4 add c binding Vedant Roy 2021-05-18 14:53:49 -0700
  • e694370733 Fix inverted bool + return correct data + remove serde Vedant Roy 2021-05-18 10:30:47 -0700
  • 2c51761d01 Implement getAddedChanges Vedant Roy 2021-05-17 20:59:08 -0700
  • 506d1e61ca
         Merge pull request #88 from automerge/implement-new-sequence-patch-format Orion Henry 2021-05-24 13:11:19 -0700
  • 6ebb63bfdd Merge branch 'main' into implement-new-sequence-patch-format Orion Henry 2021-05-24 15:50:19 -0400
  • 17b0d2eb38 cleanup for clippy Orion Henry 2021-05-24 15:07:13 -0400
  • 3465517ab3 handle conflicts in list parent modifications Orion Henry 2021-05-24 14:35:44 -0400
  • ce26ebb27d New backend finished (untested) Vedant Roy 2021-05-24 11:31:50 -0700
  • 8755112399 Everything done except syncstate Vedant Roy 2021-05-24 02:10:12 -0700
  • f449bb738e Switch to new json macro Vedant Roy 2021-05-24 01:36:02 -0700
  • 5a348cfdfa Continue implementing infra Vedant Roy 2021-05-24 00:15:22 -0700
  • 3b837811d6 Make multi-insert more efficient Andrew Jeffery 2021-05-22 23:52:34 +0100
  • 6ab8def763 Fixes Andrew Jeffery 2021-05-22 22:26:08 +0100
  • 8a87e30c14 Try to avoid overwriting and cloning Andrew Jeffery 2021-05-22 21:25:55 +0100
  • cfddd3e8d8 Implement basic infra for new C api Vedant Roy 2021-05-22 11:27:59 -0700
  • 7264b83815 Don't return the sequence Andrew Jeffery 2021-05-22 18:22:38 +0100
  • 1f5b9ad4a5 Don't track opids_in_this_diff that aren't used Andrew Jeffery 2021-05-22 18:21:11 +0100
  • 53cbe97203 Pass by value in mutation Andrew Jeffery 2021-05-22 14:49:16 +0100
  • 75d7c031a1 Apply diff shouldn't return the value Andrew Jeffery 2021-05-22 14:34:52 +0100
  • 47c825c01f No need to insert when we've removed Andrew Jeffery 2021-05-22 11:16:20 +0100
  • 43515f0c8c Clean up new_state Andrew Jeffery 2021-05-22 10:59:00 +0100
  • e3a28cd069 Dont return the value when mutated Andrew Jeffery 2021-05-22 10:40:55 +0100
  • 2d49521fa0 Make apply_diffs take mutable self Andrew Jeffery 2021-05-22 10:28:14 +0100
  • 357d43eb46 Use std hashmap for cursors Andrew Jeffery 2021-05-22 10:20:40 +0100
  • d4b21798d7 Remove more applications hiding in pure Andrew Jeffery 2021-05-22 09:44:41 +0100
  • a92e4fae9e Move to clone Andrew Jeffery 2021-05-22 01:29:08 +0100
  • 04325d16df Remove old_conflicts as it was unused Andrew Jeffery 2021-05-22 01:22:11 +0100
  • d2700492fc Use default for StateTree Andrew Jeffery 2021-05-22 00:59:44 +0100
  • cb09c84b0d Use underlying Andrew Jeffery 2021-05-22 00:47:03 +0100
  • 2d450df67b Don't keep collecting the underlying Andrew Jeffery 2021-05-22 00:33:56 +0100
  • 3606841cbe Construction should just return the value Andrew Jeffery 2021-05-22 00:01:41 +0100
  • 690ca596f8 Use a plain hashmap since conflicts should be rare Andrew Jeffery 2021-05-21 23:43:36 +0100
  • ffe5d980cf Avoid cloning value Andrew Jeffery 2021-05-21 23:43:27 +0100
  • f7d26a7e55 Move more changes in Andrew Jeffery 2021-05-21 23:34:38 +0100
  • 43015763d9 More mut Andrew Jeffery 2021-05-21 23:11:14 +0100
  • 2b02be0808 Remove need for try_map Andrew Jeffery 2021-05-21 22:37:00 +0100
  • 6aa6223f63 More mutability Andrew Jeffery 2021-05-21 22:24:05 +0100
  • 54e8a80a8d Apply changes when they are generated so no need to pass them on Andrew Jeffery 2021-05-21 22:07:27 +0100
  • 850ab07001 Take diff by value Andrew Jeffery 2021-05-21 21:29:43 +0100
  • e62ce0e0b7 More mutability improvements Andrew Jeffery 2021-05-21 21:10:06 +0100
  • 8b0a2c4f45 Avoid another union, saving about 300ms Andrew Jeffery 2021-05-21 20:43:53 +0100
  • 5b24c6cb8b Use more mut to try and get rid of a union Andrew Jeffery 2021-05-21 20:41:39 +0100
  • d0770413f8 Make ops just a vec, no need for option Andrew Jeffery 2021-05-21 19:29:36 +0100
  • 94ec9defe6 Fixup after rebase Andrew Jeffery 2021-05-21 18:34:59 +0100
  • 6ae13ba8e9 Add frontend_patch benchmarks Andrew Jeffery 2021-04-04 00:03:02 +0100
  • 8af065e8f6
         Merge pull request #144 from automerge/expose-encoding-decoding-errors Andrew Jeffery 2021-05-21 14:13:49 +0100
  • c2f2ded69f Make encoding and decoding errors public Andrew Jeffery 2021-05-21 13:52:19 +0100
  • 25a4847a98 Dont document cli Andrew Jeffery 2021-05-07 13:44:27 +0100
  • b4db8f6abe Dont document the C lib Andrew Jeffery 2021-05-07 13:26:57 +0100
  • d9d9562d95 Change outdated error message Vedant Roy 2021-05-20 09:54:07 -0700
  • 01ae8e0ece Fix overflow panic in apply_local_change fuzz-apply-local-change Andrew Jeffery 2021-05-20 13:57:44 +0100
  • c8b2e9029a Add more fuzzing Andrew Jeffery 2021-05-20 13:56:58 +0100
  • d5dfefb704
         Fix backend panics (#141) Andrew Jeffery 2021-05-20 11:24:23 +0100
  • 473f412a8c Fix another index out of bounds Andrew Jeffery 2021-05-20 10:38:53 +0100
  • 4c4c01a961 Handle no ops sub Andrew Jeffery 2021-05-20 10:13:44 +0100
  • 1312cac7b3 Add backend load fuzzing Andrew Jeffery 2021-05-20 10:01:23 +0100
  • fc929cfd3e Check addition with arbitrary val Andrew Jeffery 2021-05-20 10:00:58 +0100
  • b399f73c54 Use get rather than checking Andrew Jeffery 2021-05-20 09:52:41 +0100
  • 5170dfe253 Fix another panic out of bounds Andrew Jeffery 2021-05-20 09:45:25 +0100
  • 0bff8c0b40 Fix leb failing to read enough bytes Andrew Jeffery 2021-05-20 09:37:11 +0100
  • 176dd2bc5a Fix a panic when indexing the bytes Andrew Jeffery 2021-05-20 09:24:07 +0100
  • a0bd33e5a6
         Refactor travis to have more jobs (#120) Andrew Jeffery 2021-05-20 11:01:54 +0100
  • e75864a549
         Merge pull request #140 from automerge/mismatched-sequence-number Andrew Jeffery 2021-05-20 08:50:35 +0100
  • 0391114645 Revert "Also run on stacked PRs" Andrew Jeffery 2021-05-19 23:02:39 +0100
  • d31f704a32 Fix transfer of frontend states when we don't make a change Andrew Jeffery 2021-05-19 22:37:03 +0100
  • ab90ec85f5 Add mismatched sequence number failing test Andrew Jeffery 2021-05-19 22:11:48 +0100
  • 2c9e68d344 Implement PartialEq on more structs Andrew Jeffery 2021-05-19 22:36:49 +0100
  • 46ff9eabee Apply clippy suggestion Andrew Jeffery 2021-05-19 22:10:09 +0100