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

d35fc961e9 Ensure values have same type when constructing MultiElementInsert Vedant Roy 2021-06-07 14:37:19 -0400
93f45bcc73 Add comment explaining reason for custom serialization Vedant Roy 2021-06-07 14:36:13 -0400
0b76f5100c Add custom serialization for DiffEdit Vedant Roy 2021-06-07 14:34:53 -0400
c989033365 Add datatype for MultiSet Vedant Roy 2021-06-07 09:51:44 -0400
6f92d1583d fix error message Orion Henry 2021-06-03 16:04:32 -0400
14bfe9b6b3 Remove unnecessary newline Vedant Roy 2021-06-01 15:36:50 -0400
c377b1f491 Properly update field count Vedant Roy 2021-06-01 15:34:51 -0400
f267064ed5 test the correct repo/commit Orion Henry 2021-06-01 11:48:06 -0400
069aa338b2 strict numbers Orion Henry 2021-05-16 16:58:47 -0400
2c3f93b474 Fix interop script Vedant Roy 2021-06-25 12:57:32 -0400
f80f454c98 Try different commit hash Vedant Roy 2021-06-25 12:32:32 -0400
51c378f1bf Make benches compile Vedant Roy 2021-06-25 12:17:07 -0400
73f25779d1 Update interop tests + review comment Vedant Roy 2021-06-25 12:11:42 -0400
a2e7b33b63 Address review comments Vedant Roy 2021-06-25 11:58:30 -0400
225994e59a Tests pass after rebase Vedant Roy 2021-06-25 11:45:52 -0400
8c35dcd9e9 Rebase + clippy Vedant Roy 2021-06-18 11:25:39 -0400
b2d70dd3ed throw a proper error on change decode Orion Henry 2021-06-10 09:55:54 -0400
5f8ab22a52 Remove bad file Vedant Roy 2021-06-10 01:56:55 -0400
ca6effb1ad Satisfy clippy Vedant Roy 2021-06-10 01:55:37 -0400
75df2f5335 Tests pass Vedant Roy 2021-06-10 01:48:29 -0400
3e7e1ab242 condense_insert_ops failing Vedant Roy 2021-06-10 01:27:15 -0400
bd8007759c Encode Vec<ScalarValue> into type system as ScalarValues Vedant Roy 2021-06-08 15:33:10 -0400
3fa620a152 Remove F32 Vedant Roy 2021-06-08 12:23:43 -0400
72be1ad9fe Ensure values have same type when constructing MultiElementInsert Vedant Roy 2021-06-07 14:37:19 -0400
4af37fee9b Add comment explaining reason for custom serialization Vedant Roy 2021-06-07 14:36:13 -0400
61d07b8f09 Add custom serialization for DiffEdit Vedant Roy 2021-06-07 14:34:53 -0400
2f36f8f8c4 Add datatype for MultiSet Vedant Roy 2021-06-07 09:51:44 -0400
43342263cd fix error message Orion Henry 2021-06-03 16:04:32 -0400
b1b49179fd Remove unnecessary newline Vedant Roy 2021-06-01 15:36:50 -0400
61cd2decd6 Properly update field count Vedant Roy 2021-06-01 15:34:51 -0400
24587ca9f8 test the correct repo/commit Orion Henry 2021-06-01 11:48:06 -0400
7559286cd6 strict numbers Orion Henry 2021-05-16 16:58:47 -0400
08fd039eb3

Reduce use of new features to build on older Rusts (#184) Andrew Jeffery 2021-06-25 16:03:13 +0100
fe5a9a816d

Cleanup ColumnOp in backend and use sort_unstable (#187) Andrew Jeffery 2021-06-25 14:20:34 +0100
2c048a1368 Use ExpandedOp directly in ColumnEncoder Andrew Jeffery 2021-06-24 21:31:31 +0100
ff14917890 Use sort_unstable_by for sorting columns Andrew Jeffery 2021-06-24 21:22:41 +0100
0737248f3d Enable lto Andrew Jeffery 2021-06-22 15:27:58 +0100
c9869ebf1b Remove debug info for release builds Andrew Jeffery 2021-06-21 18:59:24 +0100
05bc80b4b2 Enable lto Andrew Jeffery 2021-06-22 15:27:58 +0100
5dcd1dd925 Remove debug info for release builds Andrew Jeffery 2021-06-21 18:59:24 +0100
b36ee54dda Update C bindings to return pointers swifty-bindings Vedant Roy 2021-06-21 11:04:48 -0400
74c33f54bb Reduce use of new features to build on older Rusts Andrew Jeffery 2021-06-20 20:46:15 +0100
885a763766

Calculate pred_for_key before deleting the key (#183) Andrew Jeffery 2021-06-20 12:46:50 +0100
4c0cac46bc Calculate pred_for_key before deleting the key Andrew Jeffery 2021-06-20 10:59:18 +0100
ffa49c8aca off by one mark2 Orion Henry 2021-06-19 13:29:59 -0400
1383068064

Backend rearrangements (#177) Andrew Jeffery 2021-06-19 17:26:56 +0100
987263b25d

Add SortedVec struct to ensure preds are sorted (#176) Andrew Jeffery 2021-06-19 17:25:25 +0100
166582ca4d Preallocate data Andrew Jeffery 2021-06-18 12:02:32 +0100
a92f9a6345 Set capacity of rangemap Andrew Jeffery 2021-06-18 11:53:14 +0100
b944bbd812 Allocate for the new value too in LiteralRun Andrew Jeffery 2021-06-18 11:36:36 +0100
4580f56fb2 Import actor once Andrew Jeffery 2021-06-18 11:36:26 +0100
fab3ccf30d Remove result for incorporate_new_op Andrew Jeffery 2021-06-17 15:58:53 +0100
985e1640fe Use default compression level for better balance of performance Andrew Jeffery 2021-06-17 15:41:11 +0100
6bd1ec9550 Use swap remove instead of remove to avoid O(n) Andrew Jeffery 2021-06-17 15:40:53 +0100
6efad76ac9 More preallocation Andrew Jeffery 2021-06-17 13:41:40 +0100
6d4bf604be Use Cow for operation keys Andrew Jeffery 2021-06-17 13:41:33 +0100
1c493f6105 Pass docops by value Andrew Jeffery 2021-06-17 13:38:46 +0100
cf45931173 Specify capacity of bytes Andrew Jeffery 2021-06-17 13:36:56 +0100
a2c4cb1941 Add into_iter for sortedvec Andrew Jeffery 2021-06-19 17:20:18 +0100
966d09e784 Add SortedVec struct to ensure preds are sorted Andrew Jeffery 2021-06-17 11:56:44 +0100
fc1b8f87fb

Use SmolStr in place of String (#182) Andrew Jeffery 2021-06-19 16:28:51 +0100
1f891b12b2 Use SmolStr in place of String Andrew Jeffery 2021-06-19 09:52:59 +0100
ca74c33dcc finished basic seek_to_op + test + bugs Orion Henry 2021-06-17 13:50:44 -0400
0cd13e0c10 more mark2 Orion Henry 2021-06-15 11:17:31 -0400
781aab84b8 missing mark2/mod.rs Orion Henry 2021-06-14 00:39:28 -0400
eb69472e25 mark2 Orion Henry 2021-06-11 13:41:47 -0400
1a95a4cf4e Comment out unused cursor code Andrew Jeffery 2021-06-18 17:33:30 +0100
ea35a7f6cf Rebase + clippy Vedant Roy 2021-06-18 11:25:39 -0400
d9aee1bd2d throw a proper error on change decode Orion Henry 2021-06-10 09:55:54 -0400
d810137903 Remove bad file Vedant Roy 2021-06-10 01:56:55 -0400
6c4623592b Satisfy clippy Vedant Roy 2021-06-10 01:55:37 -0400
f55c91c5d1 Tests pass Vedant Roy 2021-06-10 01:48:29 -0400
b304ba3ce3 Fix bug in tests? (Pretty sure it was a bug) Vedant Roy 2021-06-10 01:33:49 -0400
71306777d4 condense_insert_ops failing Vedant Roy 2021-06-10 01:27:15 -0400
e22a7bc446 Encode Vec<ScalarValue> into type system as ScalarValues Vedant Roy 2021-06-08 15:33:10 -0400
5dc37464af Remove F32 Vedant Roy 2021-06-08 12:23:43 -0400
858392062f Ensure values have same type when constructing MultiElementInsert Vedant Roy 2021-06-07 14:37:19 -0400
023934334e Add comment explaining reason for custom serialization Vedant Roy 2021-06-07 14:36:13 -0400
c50db562ea Add custom serialization for DiffEdit Vedant Roy 2021-06-07 14:34:53 -0400
683ef69ef9 Add datatype for MultiSet Vedant Roy 2021-06-07 09:51:44 -0400
4b4bcd587f fix error message Orion Henry 2021-06-03 16:04:32 -0400
96de1a750a Remove unnecessary newline Vedant Roy 2021-06-01 15:36:50 -0400
da21627401 Properly update field count Vedant Roy 2021-06-01 15:34:51 -0400
2dc38f9315 test the correct repo/commit Orion Henry 2021-06-01 11:48:06 -0400
ebe6aa551b strict numbers Orion Henry 2021-05-16 16:58:47 -0400
c6591e882a Use SmolStr for MultiGrapheme Andrew Jeffery 2021-06-18 13:20:10 +0100
ff8b8613d5

Flatten objtype (#175) Andrew Jeffery 2021-06-17 20:06:10 +0100
9d6733716c Change ActorId to be exact size array Andrew Jeffery 2021-06-17 17:11:10 +0100
7a282c8a66 More preallocations Andrew Jeffery 2021-06-17 16:17:43 +0100
ca5ebf29fb Preallocate ops in new_map_or_table Andrew Jeffery 2021-06-17 16:13:46 +0100
43d32dc33d Remove maptype and seqtype from Diffs Andrew Jeffery 2021-06-17 14:32:21 +0100
dc6164414f Use separate gen_*_diff functions Andrew Jeffery 2021-06-17 10:54:29 +0100
3584fe05c1 Use separate construct functions Andrew Jeffery 2021-06-17 10:49:12 +0100
d0663a45ab Flatten object type Andrew Jeffery 2021-06-17 10:45:03 +0100
98dbd6150e

Mutation tracker rollback (#165) Andrew Jeffery 2021-06-16 14:16:48 +0100
75d5633c3a Remove MultiThing Andrew Jeffery 2021-06-16 13:42:11 +0100
8be1148ccc Update expects Andrew Jeffery 2021-06-14 11:17:39 +0100
477d50e38e Use rollback in optimistically_apply_change Andrew Jeffery 2021-06-10 23:31:18 +0100
e3f575a22c Add rollback to MutableDocument Andrew Jeffery 2021-06-10 23:30:33 +0100
c3cf095782 Make set and delete operations return the old value Andrew Jeffery 2021-06-10 22:28:39 +0100