Commit graph

882 commits

Author SHA1 Message Date
Orion Henry
b8d71f3b53 remove undo/redo 2020-12-17 19:13:05 -05:00
Orion Henry
939ccf38aa adding ack function 2020-11-12 11:03:44 -05:00
Orion Henry
1d126dd263 faster max_op calc 2020-11-10 12:25:07 -05:00
Peter van Hardenberg
0a5e39b5fa wip 2020-11-09 15:30:31 -08:00
Orion Henry
d5b49316e7 wip 2020-11-09 18:11:49 -05:00
Orion Henry
d8d24e23a5 remove extra clone 2020-11-09 14:23:24 -05:00
Orion Henry
d03abd7457 fmt 2020-11-09 09:50:27 -05:00
Orion Henry
c2768c5ebc refactor process_request to feed the ops in one at a time removing the
dobule list management ops
2020-11-09 09:48:45 -05:00
Orion Henry
39add00bf9 fxbuildhasher 2020-11-09 09:48:45 -05:00
Orion Henry
26a5d05fe2 copy2 changes 2020-11-09 09:48:45 -05:00
Jeremy Rose
cb33262a34
remove old build scripts (#32) 2020-11-08 14:48:00 +00:00
Jeremy Rose
f1032e6342
add link to instructions for installing wasm-pack (#31) 2020-11-08 14:47:40 +00:00
Jeremy Rose
f80c395434
cargo fmt --all (#30) 2020-11-08 14:47:18 +00:00
Jeremy Rose
023f3c1672
fix automerge-cli ftbfs (#29) 2020-11-08 14:47:00 +00:00
Orion Henry
a584e202f1 adding getMissingDeps and getChanges to C API 2020-09-09 13:46:00 -04:00
Orion Henry
c1319e06eb patch has a slightly different format now 2020-09-09 12:52:25 -04:00
Orion Henry
783f615a23 update to use new format for encoding key=_head 2020-09-08 16:53:07 -04:00
Orion Henry
fb3b56112c update binary encoding for op actions to match js implementation 2020-09-08 16:29:24 -04:00
Scott Trinh
128e90bb18
cli: Add mutation CLI subcommands to IDEAS documentation (#25) 2020-06-10 11:09:59 +01: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
John Rees
c96e3e6a85
Update badges in README (#24)
* Use shields.io for crates.io badge in README

* Update Travis CI badge and link url in README
2020-06-08 12:10:02 +01:00
Orion Henry
ce75f5e29e add a deserializer for message 2020-06-05 17:48:51 -04:00
Orion Henry
fbc70ba0e3 UnencodedChange.message is a required field according to typescript - default to emptystring 2020-06-05 17:07:33 -04:00
Orion Henry
d53eae1e94 add change encode and decode to the API 2020-06-05 12:03:38 -04:00
Alex Good
1ef10f6450 Remove unnecessary in tests 2020-06-04 14:59:19 +01:00
Alex Good
80409879e0 More clippy shenanigans 2020-06-04 14:51:24 +01:00
Alex Good
7585a9d7a1 Run clippy on nightly 2020-06-04 10:30:27 +01:00
Alex Good
f5195fc25f run clippy 2020-06-04 00:35:46 +01:00
Alex Good
adfa722146 Merge branch 'master' of github.com:automerge/automerge-rs 2020-06-04 00:32:50 +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
Scott Trinh
aa87af4aaf
cli: Export state as JSON (#17) 2020-05-26 21:08:23 +01:00
Alex Good
baba6a75b6 rustfmt 2020-05-26 16:20:26 +01:00
Alex Good
339e18a6ad Merge branch 'bugfixes' 2020-05-26 16:17:45 +01:00
Alex Good
a00140c76e Merge branch 'valid-objectid-as-child-error' 2020-05-26 16:17:26 +01:00
Alex Good
03a786d608 Fix a few small bugs 2020-05-26 16:17:06 +01:00
Orion Henry
dd33e528ab
Merge pull request #20 from automerge/two-level-objtype
Two level objtype
2020-05-26 07:08:00 -07:00
Alex Good
b7527c28eb Stop child IDs which are valid object IDs raising MissingObjectError 2020-05-25 19:24:45 +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
cbfac9a7b2 clearly show when using external types via amp:: 2020-05-23 12:38:31 -04:00
Orion Henry
a8cb2d805b opid should have an actor not a string 2020-05-23 12:15:53 -04:00
Orion Henry
13142048b1
Merge pull request #19 from automerge/bin_change
Refactor Change to Be Binary Encoded
2020-05-23 08:57:42 -07:00
Orion Henry
20856bfdd9 fmt 2020-05-22 19:22:29 -04:00
Orion Henry
4cc6eb263d remove the unwrap i introduced with ActorID::try_from 2020-05-22 19:22:17 -04:00