automerge

ThetaDev/automerge

Fork 0

Commit graph

Select branches

Hide pull requests

alexjg/rc_actor

attribute-test

automerge-1.0

badmessage

big_observer

blame

c_api

clone_fork

columnar-experiments

diff

diff_at

exid

exid_rc

experiment

experiment-make

experiment-query-buffers

faster_sync

faster_sync_clock

feat/add-difference

feat/add-difference_0.3.0

fix-decompress-nits

fuzz-apply-local-change

gh-pages

load-avoid-queue

load_inc

main

mark2

marks

marks2

marks_port

patch2

patch4

patch4-and-betterjs

patch5

patch5-betterjs

payloadtest

pojo2

pojo_js

pojo_js-betterjs

querycache

rc_actor

react-example

rebase-text2

redis

remove-event-handlers

revert-434-better-js-package

rework-ids

simsim

swifty-bindings

text2wip

tmp_pr

wasm-pkg

#10

#101

#102

#103

#104

#105

#106

#107

#108

#11

#112

#113

#115

#116

#117

#118

#119

#12

#120

#123

#124

#126

#129

#13

#130

#131

#132

#133

#134

#135

#136

#138

#14

#140

#141

#144

#146

#147

#148

#149

#150

#152

#153

#154

#155

#156

#157

#159

#160

#161

#162

#163

#164

#165

#166

#168

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#215

#216

#217

#218

#219

#221

#224

#225

#227

#229

#23

#230

#231

#232

#233

#234

#236

#237

#238

#239

#24

#241

#242

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#263

#265

#268

#270

#271

#272

#273

#274

#275

#276

#277

#278

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#330

#331

#332

#333

#334

#338

#34

#340

#341

#342

#343

#346

#347

#350

#351

#355

#356

#357

#358

#360

#361

#362

#364

#365

#366

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#379

#38

#380

#381

#382

#384

#385

#386

#387

#389

#39

#390

#391

#392

#393

#397

#4

#40

#401

#402

#403

#404

#406

#407

#408

#409

#410

#413

#414

#415

#416

#417

#418

#419

#42

#421

#422

#423

#424

#425

#427

#428

#429

#43

#430

#434

#435

#436

#437

#438

#439

#440

#441

#442

#444

#445

#446

#447

#448

#449

#45

#450

#452

#453

#454

#456

#457

#458

#459

#46

#460

#462

#463

#464

#465

#466

#467

#468

#470

#471

#472

#472

#473

#474

#475

#477

#478

#480

#481

#482

#483

#484

#485

#486

#487

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#500

#501

#503

#505

#506

#507

#508

#509

#51

#510

#511

#512

#514

#515

#516

#517

#518

#519

#52

#520

#521

#523

#523

#524

#524

#529

#530

#531

#533

#534

#538

#540

#540

#541

#542

#543

#544

#544

#545

#548

#550

#550

#551

#551

#552

#552

#554

#554

#56

#59

#6

#60

#61

#62

#63

#64

#65

#66

#68

#69

#71

#72

#73

#74

#78

#79

#8

#80

#82

#84

#85

#86

#87

#88

#9

#90

#91

#92

#93

#94

#96

#97

#98

#99

automerge-js-2.0.0-beta.1

js/automerge-2.0.0

js/automerge-2.0.1

js/automerge-2.0.1-alpha.1

js/automerge-2.0.1-alpha.2

js/automerge-2.0.1-alpha.4

js/automerge-2.0.1-alpha.5

js/automerge-2.0.1-alpha.6

js/automerge-2.0.2

js/automerge-2.0.2-alpha.1

js/automerge-2.0.2-alpha.2

js/automerge-wasm-0.1.17

js/automerge-wasm-0.1.18

js/automerge-wasm-0.1.19

js/automerge-wasm-0.1.20

js/automerge-wasm-0.1.21

js/automerge-wasm-0.1.22

js/automerge-wasm-0.1.23

js/automerge-wasm-0.1.24

js/automerge-wasm-0.1.25

rust/automerge-test@0.1.0

rust/automerge-test@0.2.0

rust/automerge@0.2.0

rust/automerge@0.3.0

v0.0.1

v0.0.2

v0.13.0

4b7bbe6710 Rename peer to sync Andrew Jeffery 2021-04-16 20:16:18 +0100
cd56799e1c Move all to sync Andrew Jeffery 2021-04-16 19:56:01 +0100
766b5621d4 Add more sync work Andrew Jeffery 2021-04-16 19:06:49 +0100
3eeb825138 Initial sync work Andrew Jeffery 2021-04-16 12:26:22 +0100
20b76ae5db make history be the canonical place to store changes Orion Henry 2021-04-24 13:54:00 -0700
cb932c5dd6 added a test for get_changes fast Orion Henry 2021-04-24 12:50:36 -0700
f54abc8943 break function into two halves for testing Orion Henry 2021-04-24 14:39:36 -0400
6204b53a57 Cleanup wasm lib and make SyncState somewhat opaque to js Andrew Jeffery 2021-04-23 19:02:59 +0100
7af4eddb63 Bump interop hash and swap sent_hashes set for map in js Andrew Jeffery 2021-04-23 18:00:45 +0100
659e0af546 CI: only run on main branch Andrew Jeffery 2021-04-23 17:43:21 +0100
a1a4c63c19 CI: Don't test all targets Andrew Jeffery 2021-04-23 17:39:38 +0100
b97060d7c2 Remove unnecessary conditional Andrew Jeffery 2021-04-23 16:55:08 +0100
a3d11ce3da Just keep the sync_with_changes benchmark Andrew Jeffery 2021-04-23 16:13:06 +0100
dc5688531b Use hashset for sent_hashes in js types Andrew Jeffery 2021-04-23 13:27:23 +0100
64b4a6064e Make sent_hashes a set instead of a vec Andrew Jeffery 2021-04-23 12:37:37 +0100
cd696130af Bump js_tests commit hash Andrew Jeffery 2021-04-22 22:16:22 +0100
c11060d5a7 add fastpath to get_changes Vedant Roy 2021-04-22 12:36:47 -0700
2cbc0bac0d Only store hashes in sync_state rather than the actual changes Andrew Jeffery 2021-04-22 15:39:32 +0100
7e84cc2f55 Add total number of syncs to benchmark Andrew Jeffery 2021-04-22 11:04:48 +0100
357be63139 Improve benchmark names again Andrew Jeffery 2021-04-22 00:40:56 +0100
46db84f736 Fix benchmark names Andrew Jeffery 2021-04-22 00:34:33 +0100
f3c2a6baf6 Fix interval checking Andrew Jeffery 2021-04-22 00:33:59 +0100
cd907663a1 Separate benchmark into sync and sync with changes Andrew Jeffery 2021-04-22 00:16:39 +0100
bedd3e549c Add sync benchmark Andrew Jeffery 2021-04-21 23:57:38 +0100
463daec7db Mutate the SyncState rather than consuming and returning Andrew Jeffery 2021-04-21 23:57:24 +0100
2cbf2ae112 Fix ordering of receive_sync_message arguments Andrew Jeffery 2021-04-21 20:46:06 +0100
02ff012eee Move SyncHave to state.rs Andrew Jeffery 2021-04-21 20:34:24 +0100
63f8922760 Specify some capacities Andrew Jeffery 2021-04-21 12:35:34 +0100
701dd96fc1 Update nix config Andrew Jeffery 2021-04-09 10:53:45 +0100
b36c3712ac encodable: Require encode function implementation Andrew Jeffery 2021-04-21 10:03:39 +0100
2c19bb53f9 js_tests: Update commit hash to use sync-protocol-3 branch Andrew Jeffery 2021-04-21 11:43:32 +0100
6dd7a56f8e Add actual binary types Andrew Jeffery 2021-04-20 23:00:30 +0100
c814d53002 Move state to separate module Andrew Jeffery 2021-04-20 22:39:46 +0100
1fefd7dafd Move bloom filter to separate module Andrew Jeffery 2021-04-20 22:36:39 +0100
9b68d077e9 Update patches with pending_changes Andrew Jeffery 2021-04-20 22:28:37 +0100
5f35d5f01a Allow passing heads to automerge c backend's get_missing_deps Andrew Jeffery 2021-04-20 22:28:19 +0100
72016852af Remove our_need and fix default SyncState Andrew Jeffery 2021-04-20 22:17:08 +0100
5c36a583b8 Make a new types module and add BinaryChange to get uint8array Andrew Jeffery 2021-04-20 22:08:33 +0100
e481692906 Catch up with js changes Andrew Jeffery 2021-04-20 22:01:59 +0100
ace1f29bc4 Take ownership of have Andrew Jeffery 2021-04-19 19:12:42 +0100
9525fa5dc5 Performance updates Andrew Jeffery 2021-04-19 19:08:32 +0100
c93f4a1f2a Don't have an old_sync_state, just a sync_state Andrew Jeffery 2021-04-19 18:36:30 +0100
758c11d20b Remove unused log macro Andrew Jeffery 2021-04-19 18:26:09 +0100
bcc5a5be66 Add custom serializer just to get None to map to null Andrew Jeffery 2021-04-19 18:23:49 +0100
f92d06c6f3 Fix need request when head is a false positive Andrew Jeffery 2021-04-19 18:09:58 +0100
9edc5ad175 Fix updating sharedHeads when a subset of changes is sent Andrew Jeffery 2021-04-19 17:36:40 +0100
50f46ce266 Require vec rather than slice Andrew Jeffery 2021-04-18 15:26:29 +0100
8549c91c2b Move to binary representation of changes in api Andrew Jeffery 2021-04-18 14:49:05 +0100
3f64a72591 Remove unwraps from wasm backend Andrew Jeffery 2021-04-18 14:37:04 +0100
15ab0e86c9 Fix bug in get_missing_deps Andrew Jeffery 2021-04-18 11:10:41 +0100
730c89d1b7 Improve js interop Andrew Jeffery 2021-04-17 23:44:38 +0100
3139bfd7b2 Reorder receive_sync_message returns in js Andrew Jeffery 2021-04-17 18:19:02 +0100
3adc472391 More borrowing Andrew Jeffery 2021-04-17 16:55:31 +0100
02d4b73bba Use more references Andrew Jeffery 2021-04-17 16:42:29 +0100
0eb84b1188 Use nicer syntax for repeat Andrew Jeffery 2021-04-17 16:30:42 +0100
a52309a37e Implement encodable for slice of change hashes Andrew Jeffery 2021-04-17 16:30:30 +0100
49d65ee0db Remove clone Andrew Jeffery 2021-04-17 15:48:55 +0100
7ebceb28cc Remove unnecessary brackets Andrew Jeffery 2021-04-17 15:48:44 +0100
d5160cd72d Inline probe as usize Andrew Jeffery 2021-04-17 15:40:41 +0100
decc627bee Use builtin function to build u32 from bytes Andrew Jeffery 2021-04-17 15:39:28 +0100
e6495e7887 Advance heads only needs slice Andrew Jeffery 2021-04-17 11:25:21 +0100
4f2320f94a Use SyncHave::default Andrew Jeffery 2021-04-17 11:23:25 +0100
deea2ce5d8 Remove unwraps in sync Andrew Jeffery 2021-04-17 11:20:41 +0100
71d06fa12e Swap some arguments in js interface Andrew Jeffery 2021-04-17 10:26:25 +0100
086bc3df2e Rename peer_state to sync_state Andrew Jeffery 2021-04-17 10:22:41 +0100
d2863b1236 Properly handle conversion to null for optional message Andrew Jeffery 2021-04-16 20:31:54 +0100
bc530fa8ed Rename peer to sync Andrew Jeffery 2021-04-16 20:16:18 +0100
282bbda173 Move all to sync Andrew Jeffery 2021-04-16 19:56:01 +0100
69509f0a5f Add more sync work Andrew Jeffery 2021-04-16 19:06:49 +0100
a6c47dbdf6 Initial sync work Andrew Jeffery 2021-04-16 12:26:22 +0100
c9ba656c0c

CI: Use newer version of nodejs (#93) Andrew Jeffery 2021-04-21 12:24:51 +0100
c2af9ef04a Add newer version of nodejs Andrew Jeffery 2021-04-14 20:43:32 +0100
fb59ce746d

Fix typo (#98) Everett Pompeii 2021-04-20 16:45:40 -0400
85d679ed73

Fix typo Everett Pompeii 2021-04-20 13:48:26 -0400
fc45ff09a3

Allow change to return value from users closure (#84) Andrew Jeffery 2021-04-15 10:49:04 +0100
9c5f7f8482

Change Increment operation to use i64 (#79) Andrew Jeffery 2021-04-15 10:35:17 +0100
a4c866600b Change count back to isize Andrew Jeffery 2021-04-09 20:28:42 +0100
8179fff5ce Change unwrap_or_default to unwrap Andrew Jeffery 2021-04-02 21:55:29 +0100
068c6ccfda encoding: add documentation and use i64 for rledecoder count Andrew Jeffery 2021-04-01 17:41:35 +0100
4bdeb9684b Add closure_result field to OptimisticChangeResult Andrew Jeffery 2021-04-05 21:10:00 +0100
2cf75256ea Allow change to return value from users closure Andrew Jeffery 2021-04-01 17:10:38 +0100
e607d2e22b

add js interop testing (#91) Vedant Roy 2021-04-07 08:54:51 -0700
137e6d2808 Fix clippy lints Andrew Jeffery 2021-04-05 21:37:27 +0100
342504714a Format Andrew Jeffery 2021-04-05 21:36:01 +0100
ef6589ea1a Ensure we return to the root build dir Andrew Jeffery 2021-04-05 21:21:41 +0100
7e08bf131e testing travis ci Orion Henry 2021-04-07 10:57:14 -0400
8e2723bb2e more intuitive order Vedant Roy 2021-04-06 16:57:30 -0700
780fd75a9d friendly error message + fix inverted if Vedant Roy 2021-04-06 16:54:26 -0700
2b3f2b5186 add to travis Vedant Roy 2021-04-06 11:12:01 -0700
ca632d762d implement suggestions Vedant Roy 2021-04-06 11:10:07 -0700
81f836d489 checkout specific commit + fix bug in if stmt Vedant Roy 2021-04-05 15:34:29 -0700
57f8250a8f add js interop testing Vedant Roy 2021-04-05 15:25:27 -0700
97960d8123 Fix clippy lints Andrew Jeffery 2021-04-05 21:37:27 +0100
213b3ac96d Format Andrew Jeffery 2021-04-05 21:36:01 +0100
6a5d82060c Ensure we return to the root build dir Andrew Jeffery 2021-04-05 21:21:41 +0100
ae56f0d12f explicitly use the static library Orion Henry 2021-04-03 12:31:13 -0400
38214ca21e

Merge pull request #65 from automerge/implement-compression Martin Kleppmann 2021-04-02 17:47:39 +0100
f63fbe6156 Fix release build Martin Kleppmann 2021-04-02 17:40:52 +0100
78d0e4e9d3 Add getAllChanges to wasm backend Martin Kleppmann 2021-04-02 16:52:32 +0100
7ae0edb283 Remove getChangesForActor from wasm backend Martin Kleppmann 2021-04-02 16:51:09 +0100