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

d3ef07d79f

Merge pull request #113 from automerge/backend-tidy Andrew Jeffery 2021-05-07 11:58:56 +0100
1289f70ac4

Remove duplicate yarn release in travis (#108) Andrew Jeffery 2021-05-07 11:56:41 +0100
21ab3468a7 Fix clippy Andrew Jeffery 2021-05-05 22:43:55 +0100
708db48fbb Fixup after rebase Andrew Jeffery 2021-05-05 21:58:18 +0100
38b285e26e Update commit hash for interop testing Andrew Jeffery 2021-05-05 20:24:12 +0100
e86aabb6a3 Implement new sequence patch format Alex Good 2021-03-17 11:51:59 +0000
d2898fd0d7 Add clippy lints Andrew Jeffery 2021-05-04 20:19:47 +0100
825cc92b51 Delay cloning until the end Andrew Jeffery 2021-05-04 20:15:25 +0100
6da6480c9b Move change into update_history to avoid a clone Andrew Jeffery 2021-05-04 20:04:59 +0100
8254ba6231 Change states to use indices into history Andrew Jeffery 2021-05-04 20:00:00 +0100
39819e6947 Ensure that ChangeBytes::compressed contains the original compressed bytes, fixes #95 Alex Good 2021-05-01 19:32:08 +0100
ba0c60dc1f Remove duplicate yarn release in travis Andrew Jeffery 2021-04-28 17:01:18 +0100
8f6e663d99 SyncState: encode can take a ref Andrew Jeffery 2021-04-27 15:08:17 +0100
3a8447c068

Remove automerge bench harness (#106) Andrew Jeffery 2021-04-27 10:30:07 +0100
76bd80d1de Remove automerge bench harness Andrew Jeffery 2021-04-26 21:14:47 +0100
f18066bb10

Fix formatting (#105) Andrew Jeffery 2021-04-26 21:09:11 +0100
d1e4d7a530 Install wasm-pack with cargo Andrew Jeffery 2021-04-26 21:07:00 +0100
86dc61df09 Add rust cache Andrew Jeffery 2021-04-14 21:23:49 +0100
6f3a4ac99b Fix formatting Andrew Jeffery 2021-04-26 20:56:56 +0100
2de19617ac Format Andrew Jeffery 2021-04-26 20:44:06 +0100
c38476368c Use default criterion config Andrew Jeffery 2021-03-28 21:33:38 +0100
7175ceeb47 Add some save and load benchmarks Andrew Jeffery 2021-03-28 21:21:17 +0100
b4dca5c388 Fixup save_load benchmark Andrew Jeffery 2021-04-26 20:32:43 +0100
31d7f5facd Use default criterion config Andrew Jeffery 2021-03-28 21:33:38 +0100
2c3c30409c Add some save and load benchmarks Andrew Jeffery 2021-03-28 21:21:17 +0100
7252596691 formatting change Orion Henry 2021-04-26 14:05:59 -0400
0e08f00c34 remove direct array access Orion Henry 2021-04-26 14:03:11 -0400
98537d9b80 get changes fast Orion Henry 2021-04-25 18:16:25 -0400
acd578f63c formatting change Orion Henry 2021-04-26 14:05:59 -0400
2f8137acd8 remove direct array access Orion Henry 2021-04-26 14:03:11 -0400
d1934f2286 Add formatting config Andrew Jeffery 2021-04-17 10:30:38 +0100
63d09d5c7e Change count back to isize Andrew Jeffery 2021-04-09 20:28:42 +0100
0305acbd49 Change unwrap_or_default to unwrap Andrew Jeffery 2021-04-02 21:55:29 +0100
94e0fd7e49 encoding: add documentation and use i64 for rledecoder count Andrew Jeffery 2021-04-01 17:41:35 +0100
5d0e1052cc update get_missing for c api Orion Henry 2021-04-26 11:18:59 -0400
74df2dac58 Add formatting config Andrew Jeffery 2021-04-17 10:30:38 +0100
18ce93603a encodable: Require encode function implementation Andrew Jeffery 2021-04-21 10:03:39 +0100
888357c60f get changes fast Orion Henry 2021-04-25 18:16:25 -0400
76bd4fca7b Reduce cloning of jssyncstates in wasm backend Andrew Jeffery 2021-04-23 23:07:27 +0100
3a8baf7b0a Filter sent hashes down to only what they haven't seen Andrew Jeffery 2021-04-24 14:05:18 +0100
748d8f9a58 Update nix config Andrew Jeffery 2021-04-09 10:53:45 +0100
42f7a90410 cargo fmt Orion Henry 2021-04-24 14:41:51 -0700
a0d2c3e6e0 cleanup clippy Orion Henry 2021-04-24 14:36:31 -0700
43f6497e8d Filter sent hashes down to only what they haven't seen Andrew Jeffery 2021-04-24 14:05:18 +0100
6cd2a5f6e4 Cleanup wasm lib and make SyncState somewhat opaque to js Andrew Jeffery 2021-04-23 19:02:59 +0100
de06c92ab7 Bump interop hash and swap sent_hashes set for map in js Andrew Jeffery 2021-04-23 18:00:45 +0100
1f3a6d0ffc CI: only run on main branch Andrew Jeffery 2021-04-23 17:43:21 +0100
7fa62da400 CI: Don't test all targets Andrew Jeffery 2021-04-23 17:39:38 +0100
8bb14b73d5 Remove unnecessary conditional Andrew Jeffery 2021-04-23 16:55:08 +0100
7b7ca898b8 Just keep the sync_with_changes benchmark Andrew Jeffery 2021-04-23 16:13:06 +0100
b3a7eff559 Use hashset for sent_hashes in js types Andrew Jeffery 2021-04-23 13:27:23 +0100
8d3096b823 Make sent_hashes a set instead of a vec Andrew Jeffery 2021-04-23 12:37:37 +0100
0e9ee417b9 Bump js_tests commit hash Andrew Jeffery 2021-04-22 22:16:22 +0100
e3de7d970a Only store hashes in sync_state rather than the actual changes Andrew Jeffery 2021-04-22 15:39:32 +0100
d9427da7ae Add total number of syncs to benchmark Andrew Jeffery 2021-04-22 11:04:48 +0100
35e6cacbe0 Improve benchmark names again Andrew Jeffery 2021-04-22 00:40:56 +0100
b8395339a5 Fix benchmark names Andrew Jeffery 2021-04-22 00:34:33 +0100
e2f0b1f15a Fix interval checking Andrew Jeffery 2021-04-22 00:33:59 +0100
701f63c624 Separate benchmark into sync and sync with changes Andrew Jeffery 2021-04-22 00:16:39 +0100
3c946bd234 Add sync benchmark Andrew Jeffery 2021-04-21 23:57:38 +0100
4c7e0c9167 Mutate the SyncState rather than consuming and returning Andrew Jeffery 2021-04-21 23:57:24 +0100
90cbbc7cab Fix ordering of receive_sync_message arguments Andrew Jeffery 2021-04-21 20:46:06 +0100
1f338393c3 Move SyncHave to state.rs Andrew Jeffery 2021-04-21 20:34:24 +0100
7c2fd94c62 Specify some capacities Andrew Jeffery 2021-04-21 12:35:34 +0100
d1df9202c7 js_tests: Update commit hash to use sync-protocol-3 branch Andrew Jeffery 2021-04-21 11:43:32 +0100
ffea77f985 Add actual binary types Andrew Jeffery 2021-04-20 23:00:30 +0100
e58ba342f8 Move state to separate module Andrew Jeffery 2021-04-20 22:39:46 +0100
21d19cc909 Move bloom filter to separate module Andrew Jeffery 2021-04-20 22:36:39 +0100
aebfdc6572 Update patches with pending_changes Andrew Jeffery 2021-04-20 22:28:37 +0100
ef36eba694 Allow passing heads to automerge c backend's get_missing_deps Andrew Jeffery 2021-04-20 22:28:19 +0100
d61f1e1c6e Remove our_need and fix default SyncState Andrew Jeffery 2021-04-20 22:17:08 +0100
6c93315d74 Make a new types module and add BinaryChange to get uint8array Andrew Jeffery 2021-04-20 22:08:33 +0100
0a377a858b Catch up with js changes Andrew Jeffery 2021-04-20 22:01:59 +0100
6b424d6e97 Take ownership of have Andrew Jeffery 2021-04-19 19:12:42 +0100
220580506d Performance updates Andrew Jeffery 2021-04-19 19:08:32 +0100
f8df532d25 Don't have an old_sync_state, just a sync_state Andrew Jeffery 2021-04-19 18:36:30 +0100
0655f7ade6 Remove unused log macro Andrew Jeffery 2021-04-19 18:26:09 +0100
f30a14d8f0 Add custom serializer just to get None to map to null Andrew Jeffery 2021-04-19 18:23:49 +0100
7c3f52f2e3 Fix need request when head is a false positive Andrew Jeffery 2021-04-19 18:09:58 +0100
62f6c6d288 Fix updating sharedHeads when a subset of changes is sent Andrew Jeffery 2021-04-19 17:36:40 +0100
6b6135d108 Require vec rather than slice Andrew Jeffery 2021-04-18 15:26:29 +0100
85f53685e2 Move to binary representation of changes in api Andrew Jeffery 2021-04-18 14:49:05 +0100
fd9e01fd9e Remove unwraps from wasm backend Andrew Jeffery 2021-04-18 14:37:04 +0100
7d13091393 Fix bug in get_missing_deps Andrew Jeffery 2021-04-18 11:10:41 +0100
68ddb2504e Improve js interop Andrew Jeffery 2021-04-17 23:44:38 +0100
646f88c2d2 Reorder receive_sync_message returns in js Andrew Jeffery 2021-04-17 18:19:02 +0100
e1bdf34471 More borrowing Andrew Jeffery 2021-04-17 16:55:31 +0100
00dcd531c1 Use more references Andrew Jeffery 2021-04-17 16:42:29 +0100
3fd548cbe1 Use nicer syntax for repeat Andrew Jeffery 2021-04-17 16:30:42 +0100
7573c58521 Implement encodable for slice of change hashes Andrew Jeffery 2021-04-17 16:30:30 +0100
69bbd8c64d Remove clone Andrew Jeffery 2021-04-17 15:48:55 +0100
469b40e371 Remove unnecessary brackets Andrew Jeffery 2021-04-17 15:48:44 +0100
34ede85699 Inline probe as usize Andrew Jeffery 2021-04-17 15:40:41 +0100
4dd2d42629 Use builtin function to build u32 from bytes Andrew Jeffery 2021-04-17 15:39:28 +0100
9cd146a464 Advance heads only needs slice Andrew Jeffery 2021-04-17 11:25:21 +0100
8b4632ae07 Use SyncHave::default Andrew Jeffery 2021-04-17 11:23:25 +0100
c5d3572670 Remove unwraps in sync Andrew Jeffery 2021-04-17 11:20:41 +0100
84bfb342c8 Swap some arguments in js interface Andrew Jeffery 2021-04-17 10:26:25 +0100
10e481ad0f Rename peer_state to sync_state Andrew Jeffery 2021-04-17 10:22:41 +0100
7c117ab3b1 Properly handle conversion to null for optional message Andrew Jeffery 2021-04-16 20:31:54 +0100