automerge

ThetaDev/automerge

Fork 0

Commit graph

3a605e6747 cli: Require file path if not streaming in or out Scott 2020-05-26 21:32:46 -04:00
9f7bbe4700 cli: Add atty to check if stdin/out is a TTY Scott 2020-05-26 21:32:13 -04:00
e6e8ede941 cli: Update import for reader/writer interface Scott 2020-05-26 21:01:53 -04:00
b6247b2a38 cli: Update export for reader/writer interface Scott 2020-05-26 21:01:18 -04:00
4c39c61192 cli: wip Save bytes to out file Scott 2020-05-20 13:36:25 -04:00
75f1631e25 cli: wip Add import command Scott 2020-05-19 21:47:11 -04:00
aa87af4aaf

cli: Export state as JSON (#17) Scott Trinh 2020-05-26 16:08:23 -04:00
f27c54e8ce cli: Remove unnecessary unwrap Scott 2020-05-26 13:55:23 -04:00
d99b5d0c8b Merge branch 'master' into cli-export-json Scott 2020-05-26 12:12:01 -04:00
baba6a75b6 rustfmt Alex Good 2020-05-26 16:20:26 +01:00
339e18a6ad Merge branch 'bugfixes' Alex Good 2020-05-26 16:17:45 +01:00
a00140c76e Merge branch 'valid-objectid-as-child-error' Alex Good 2020-05-26 16:17:26 +01:00
03a786d608 Fix a few small bugs Alex Good 2020-05-26 16:17:06 +01:00
d3cdd4cb12 Merge branch 'master' into cli-export-json Scott 2020-05-26 10:22:40 -04:00
dd33e528ab

Merge pull request #20 from automerge/two-level-objtype Orion Henry 2020-05-26 07:08:00 -07:00
4a8e1f8497 cli: Add flat map test Scott 2020-05-25 20:23:03 -04:00
b7527c28eb Stop child IDs which are valid object IDs raising MissingObjectError Alex Good 2020-05-25 19:20:02 +01:00
baaebef6d1 Merge branch 'master' into two-level-objtype Alex Good 2020-05-25 18:47:46 +01:00
4030e5ce02 Merge branch 'master' into cli-export-json Scott 2020-05-25 11:55:36 -04:00
ab71d01487 internal types impl COPY Orion Henry 2020-05-23 13:11:12 -04:00
a589689bdb Fix clippy Alex Good 2020-05-24 11:19:05 +01:00
2443cdf860 Remove objtype wrapper for diffs Alex Good 2020-05-24 11:06:23 +01:00
40c8f8f9b3 Move ObjType to two level hierarchy Alex Good 2020-05-24 10:22:18 +01:00
b03cc27638 Merge branch 'master' into cli-export-json Scott 2020-05-23 21:14:29 -04:00
cbfac9a7b2 clearly show when using external types via amp:: Orion Henry 2020-05-23 12:38:31 -04:00
a8cb2d805b opid should have an actor not a string Orion Henry 2020-05-23 12:15:53 -04:00
13142048b1

Merge pull request #19 from automerge/bin_change Orion Henry 2020-05-23 08:57:42 -07:00
08568b7a2e rustfmt Scott 2020-05-23 08:45:57 -04:00
f73e240b69 Merge branch 'master' into cli-export-json Scott 2020-05-23 08:44:44 -04:00
98247f1623 frontend: wip unit tests Scott 2020-05-23 08:43:28 -04:00
20856bfdd9 fmt Orion Henry 2020-05-22 19:22:29 -04:00
4cc6eb263d remove the unwrap i introduced with ActorID::try_from Orion Henry 2020-05-22 19:22:17 -04:00
e834abe1f7 remove old crates Orion Henry 2020-05-22 19:16:17 -04:00
25393130e8 Merge remote-tracking branch 'origin/master' into bin_change Orion Henry 2020-05-22 19:11:16 -04:00
48dfd6f29a ActorID is now bytes Orion Henry 2020-05-22 19:00:39 -04:00
87b44cf977 ChangeRequest->Request Orion Henry 2020-05-22 16:11:26 -04:00
c6ec8515af move OpType and Operation back to Backend Orion Henry 2020-05-22 15:54:14 -04:00
e9c03ccdaa BinChange is now Change Orion Henry 2020-05-22 15:16:42 -04:00
a6f1499b2f Change -> UnencodedChange Orion Henry 2020-05-22 15:10:19 -04:00
92d357efe7 break out change - do some cleanup Orion Henry 2020-05-22 14:57:51 -04:00
89a1ed46f7 move change back to the backend repo Orion Henry 2020-05-22 13:54:02 -04:00
2567efcc70 Port apply local patch tests Alex Good 2020-05-22 13:43:41 +01:00
ad1b1490d8 fmt Orion Henry 2020-05-21 19:05:57 -04:00
2d31ed09cc canonical BinChange wip Orion Henry 2020-05-20 23:20:05 -04:00
045656ac46 Port the backend concurrency tests Alex Good 2020-05-21 16:01:57 +01:00
4738e3c52f Run rustfmt and clippy Alex Good 2020-05-21 13:05:33 +01:00
c1af21e42e Port refuse to overwrite counter Alex Good 2020-05-21 13:03:19 +01:00
11c9ad9ba9 Port counters inside lists test Alex Good 2020-05-21 12:57:24 +01:00
425beb2f3f Port counters inside maps test Alex Good 2020-05-21 12:47:41 +01:00
baf0bc4c0c Port delete in list elements test Alex Good 2020-05-21 12:11:23 +01:00
42b2c02d3f Port a few more tests Alex Good 2020-05-21 00:49:55 +01:00
5085f3432f frontend: Remove redundant clone Scott 2020-05-20 18:09:33 -04:00
8dc6c7f515 Merge branch 'master' into cli-export-json Scott 2020-05-20 18:08:57 -04:00
0b23a1d7d2 cli: Collapse intermediate functions and pass writer explicitly Scott 2020-05-20 17:21:19 -04:00
2aeec9b52f cli: Use apply_changes_binary to get patch from changes bytes Scott 2020-05-20 17:11:37 -04:00
ad6afb9e4d Port the delete keys in map frontend test Alex Good 2020-05-20 21:24:51 +01:00
dcdbe4666a Merge branch 'master' into cli-export-json Scott 2020-05-20 15:02:57 -04:00
fb32dac173

protocol: Hex-encode random ActorID (#18) Scott Trinh 2020-05-20 14:49:25 -04:00
67e97d760f frontend: Remove redundant clone Scott 2020-05-20 14:04:21 -04:00
a28f3990c7 protocol: Encode UUID bytes directly Scott 2020-05-20 14:02:34 -04:00
159fd117b6 protocol: Hex-encode random ActorID Scott 2020-05-20 13:43:24 -04:00
c918da4d32 Port the update in nested maps frontend test Alex Good 2020-05-20 18:24:28 +01:00
1478a3eebc fix my stdout binary ideas Orion Henry 2020-05-19 16:51:31 -04:00
46d7aeb5a0 more idea tweaks Orion Henry 2020-05-19 16:46:53 -04:00
14c95c10b9 rustfmt Scott 2020-05-19 14:23:00 -04:00
89ca6c70b7 cli: Use anyhow for application-level error handling Scott 2020-05-19 14:22:01 -04:00
33906bd159 cli: Revert back to clap to use incorporated structopt Scott 2020-05-19 14:03:46 -04:00
f176d45d8e Use built-in fs function for reading path to bytes Scott 2020-05-19 13:10:55 -04:00
57d23f7eb1 cli: Return serde::Value instead of whole state Scott 2020-05-19 12:07:55 -04:00
9aa099407e cli: Add help text Scott 2020-05-19 11:55:31 -04:00
d58140da55 cli: Add toml output format placeholder Scott 2020-05-19 11:49:22 -04:00
9da28f5dc0 rustfmt Scott 2020-05-19 11:44:09 -04:00
e46043cfc0 cli: Add export format option scaffolding Scott 2020-05-19 11:38:35 -04:00
ccd30e63ea cli: Move existing functionality into export module Scott 2020-05-18 21:52:44 -04:00
de3d17dce9 cli: Use StructOpt to build basic CLI opts struct Scott 2020-05-18 21:52:16 -04:00
169ea36a16 cli: Add basic CLI error enum Scott 2020-05-18 21:50:59 -04:00
1256060458 tweak ideas.md Orion Henry 2020-05-18 13:52:40 -04:00
6654bb2fed ideas file for cli Orion Henry 2020-05-18 13:38:08 -04:00
67f857f248 Run rustfmt Alex Good 2020-05-16 02:23:26 +01:00
a4f6020f7c Merge branch 'master' of github.com:automerge/automerge-rs Alex Good 2020-05-16 02:22:03 +01:00
0e5ce40cff Fix tests Alex Good 2020-05-15 21:07:50 +01:00
978ab89f59 Add more detail re. performance branch to the README Alex Good 2020-05-13 19:13:16 +01:00
26ded9e501 cleanup but git fmt Orion Henry 2020-05-15 14:45:06 -04:00
9bb374b492 Run rustfmt Alex Good 2020-05-14 01:05:01 +01:00
f8fe19ef08 run clippy Alex Good 2020-05-14 00:54:06 +01:00
3bfae69e19 Merge branch 'master' into frontend Alex Good 2020-05-14 00:18:02 +01:00
ee8505949d more tests in the C api Orion Henry 2020-05-13 16:53:03 -04:00
df3f4f2eba c interface v2 Orion Henry 2020-05-13 15:37:46 -04:00
6fd6d0f839 Port nested state creation test Alex Good 2020-05-13 19:01:15 +01:00
c415d95c71 Merge branch 'performance' into frontend Alex Good 2020-05-13 16:33:22 +01:00
fb170531d1 Merge branch 'performance' Orion Henry 2020-05-13 12:17:18 -04:00
587ee83187 update readme Orion Henry 2020-05-13 12:13:42 -04:00
50655c3b82 insert field in undo_ops Orion Henry 2020-05-13 11:47:10 -04:00
200233c9a0 resolve time to second Orion Henry 2020-05-13 11:46:25 -04:00
73336e11cc true is true Orion Henry 2020-05-13 09:39:04 -04:00
e5015467b3

Merge pull request #14 from automerge/protocol-crate Orion Henry 2020-05-13 06:13:49 -07:00
a1f89be19d Remove duplicated line in Cargo.toml Alex Good 2020-05-10 14:54:28 +01:00
6d3e9ea6db Run cargo fmt on protocol crate Alex Good 2020-05-10 14:33:18 +01:00
f91aa3375b Remove From<&[u8]> for ChangeHash and add TryFrom<&[u8]> Alex Good 2020-05-10 14:31:23 +01:00
49f69d741a Move ChangeHash into protocol/lib.rs and rename new -> zero Alex Good 2020-05-10 14:16:48 +01:00