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

105 commits

Author SHA1 Message Date
Alex Good
52c008788b Run rustfmt 2021-02-15 15:42:59 +00:00
Alex Good
29f29581e6 Fix build error and remove cargo cache from Travis 2021-02-15 15:36:04 +00:00
Alex Good
26dfc7ea40 Implement cursor logic in backend 2021-02-12 12:03:10 -05:00
Alex Good
2d31952d77 Implement encoding and decoding of cursor operations 2021-02-12 12:03:10 -05:00
Orion Henry
d4a60dafc1 Merge branch 'main' of github.com:automerge/automerge-rs into main 2021-01-29 17:56:14 -05:00
Orion Henry
c135b02a48 full document compression 2021-01-29 17:55:59 -05:00
Alex Good
24dcd9c1e6 Add automerge change CLI op 2021-01-29 14:27:51 +00:00
Alex Good
ae4b9f8f94 Add some benchmarks and make some performance related tweaks 2021-01-25 13:49:38 +00:00
Alex Good
20bbe7c8b0 Run cargo fmt 2021-01-20 15:48:04 +00:00
Alex Good
8142d42796 Add first crdt benchmark and some frontend optimisations 2021-01-20 15:18:47 +00:00
Alex Good
8516476db2 Fix handling of Unchanged diffs in StateTreeValue::new_from_diff 2021-01-19 14:55:54 +00:00
Alex Good
56750f68d1 Fix inserts at beginning of a text object 2021-01-19 14:20:09 +00:00
Alex Good
c45d055ce3 Fix clippy 2021-01-16 17:55:30 +00:00
Alex Good
497372db99 Immutable frontend rewrite 2021-01-16 17:40:47 +00:00
Martin Kleppmann
5ec8408398 Replace all-zeros UUID with '_root' 
Corresponding to automerge/automerge@10ec271cbd
 2021-01-12 14:45:32 -05:00
Scott Trinh
b943c41e7d
 		cli: Add import command (#21) 
* cli: wip Add import command

* cli: wip Save bytes to out file

* cli: Update `export` for reader/writer interface

* cli: Update import for reader/writer interface

* cli: Add `atty` to check if stdin/out is a TTY

* cli: Require file path if not streaming in or out

* cli: Align naming of the binary changes file, whether in or out

* cli: Small documentation fixes

* cli: Allow specifying an input file for import

* cli: Add `duct` crate for testing

* cli: comment-out println that was showing up in output files

* cli: Add basic CLI tests for import, export, and import -> export

* cli: EOF NL

* cli: Remove a few redundant calls to clone

* cli: Move duct to dev-dependencies

* Remove debug message
 2020-06-08 20:01:55 +01:00
Alex Good
f5195fc25f run clippy 2020-06-04 00:35:46 +01:00
Alex Good
d7560d88ed Start making errors more descriptive 2020-06-04 00:32:18 +01:00
Alex Good
2cf2835e76 Make Patch::clock keys ActorID rather than String 2020-05-30 01:44:00 +01:00
Alex Good
62345c2b5f Make Patch::actor an ActorID, not a string 2020-05-30 01:24:26 +01:00
Alex Good
a36a364443 Rename automerge_protocol::Value -> ScalarValue 2020-05-29 21:04:29 +01:00
Alex Good
03a786d608 Fix a few small bugs 2020-05-26 16:17:06 +01:00
Alex Good
baaebef6d1 Merge branch 'master' into two-level-objtype 2020-05-25 18:47:46 +01:00
Orion Henry
ab71d01487 internal types impl COPY 2020-05-25 09:43:28 -04:00
Alex Good
a589689bdb Fix clippy 2020-05-24 11:19:05 +01:00
Alex Good
2443cdf860 Remove objtype wrapper for diffs 2020-05-24 11:06:23 +01:00
Alex Good
40c8f8f9b3 Move ObjType to two level hierarchy 2020-05-24 10:22:18 +01:00
Orion Henry
25393130e8 Merge remote-tracking branch 'origin/master' into bin_change 2020-05-22 19:11:52 -04:00
Orion Henry
48dfd6f29a ActorID is now bytes 2020-05-22 19:00:39 -04:00
Orion Henry
87b44cf977 ChangeRequest->Request 2020-05-22 16:11:26 -04:00
Alex Good
2567efcc70 Port apply local patch tests 2020-05-22 15:11:42 +01:00
Alex Good
045656ac46 Port the backend concurrency tests 2020-05-21 18:40:36 +01:00
Alex Good
4738e3c52f Run rustfmt and clippy 2020-05-21 13:05:33 +01:00
Alex Good
c1af21e42e Port refuse to overwrite counter 2020-05-21 13:03:19 +01:00
Alex Good
425beb2f3f Port counters inside maps test 2020-05-21 12:47:41 +01:00
Alex Good
baf0bc4c0c Port delete in list elements test 2020-05-21 12:11:23 +01:00
Alex Good
42b2c02d3f Port a few more tests 2020-05-21 00:49:55 +01:00
Alex Good
ad6afb9e4d Port the delete keys in map frontend test 2020-05-20 21:25:13 +01:00
Alex Good
c918da4d32 Port the update in nested maps frontend test 2020-05-20 18:26:07 +01:00
Alex Good
0e5ce40cff Fix tests 2020-05-16 02:20:52 +01: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
Alex Good
6fd6d0f839 Port nested state creation test 2020-05-13 19:01:15 +01:00
Alex Good
c415d95c71 Merge branch 'performance' into frontend 2020-05-13 17:53:47 +01:00
Alex Good
dd650b0c38 Merge branch 'performance' into frontend 2020-05-09 13:04:44 +01:00
Alex Good
e3fe5b9d6d One more passing test 2020-05-08 00:24:34 +01:00
Alex Good
6ad3e13fc0 Tests passing with optimistic local diff application 2020-05-07 16:02:02 +01:00
Alex Good
0223433a36 WIP 2020-05-05 20:12:42 +01:00
Alex Good
65b2a056ac WIP 2020-04-27 19:38:32 +01:00
Alex Good
15b7bb8c60 Make a CLI out of an enmormous pile of hacks 2020-04-22 00:35:10 +01:00