Code

[WIP] Fix/improve manual edit#211

Code

Open

vidartf wants to merge 48 commits intojupyter:masterjupyter/nbdime:masterfrom vidartf:manual-editvidartf/nbdime:manual-editCopy head branch name to clipboard

+2,368-419

Commits

Commits on May 7, 2018

• extendArray utility

  vidartf

  committed
  72da019

• Add IModel with parent field to all models

  vidartf

  committed
  dfb4c69

• Have tests use IModel parent

  vidartf

  committed
  c568019

• Allow forcing 4-way view

  vidartf

  committed
  6a68099

• Add unchanged models for deleted cells

  Show description for cdad268
  vidartf

  committed
  cdad268

• Manual edits WIP

  vidartf

  committed
  6169cfb

• Add yellow highlighting for custom diffs

  vidartf

  committed
  13dcd61

• Do not highlight custom characters

  Show description for a53dab9
  vidartf

  committed
  a53dab9

• Fix picker for custom diffs

  vidartf

  committed
  d4f065a

• Fix replaceArray bug

  vidartf

  committed
  97e88f9

• Improve partial finding

  vidartf

  committed
  a32b4a1

• Improve/fix edit/diff overlap matching

  vidartf

  committed
  42c8a65

• Label manual edits with source

  vidartf

  committed
  2fae680

• Fix tests

  vidartf

  committed
  80ed514

• Copy source when converting patch ops

  vidartf

  committed
  6cffc25

• Adjust getPartials

  vidartf

  committed
  bbc9139

• Ensure manual diff is labeled with source

  vidartf

  committed
  e7c136e

• Rename findDeletionOverlap -> findEditOverlap

  vidartf

  committed
  071dbc1

• Add editing of unchanged models

  vidartf

  committed
  35730e0

• Add level to manual edit tests

  vidartf

  committed
  c08a168

• Remove unneeded casting

  vidartf

  committed
  f980c97

• Fix convertPatchOps

  Show description for 472353f
  vidartf

  committed
  472353f

• Allow findEditOverlap to also accept patch ops

  vidartf

  committed
  7a7c491

• combineDecisions also combines local/remote diff

  vidartf

  committed
  99739fd

• Add ability to edit patched cells

  vidartf

  committed
  0889421

• Invalidate edited model

  vidartf

  committed
  96c2a30

• Enable tests for unchanged model

  vidartf

  committed
  15bde1e

• Adjustments to edit of patched cells

  vidartf

  committed
  ecead75

• MergeView code for editing by hand

  vidartf

  committed
  c6543ef

• Mark origin of syncModel editor text replacements

  vidartf

  committed
  2f1e246

• Outline decisions with mixed sources

  vidartf

  committed
  0af12a4

• Consider line no. changes in syncModel updating

  vidartf

  committed
  d063f38

• Web: Improve manual edit decision overlap detection

  vidartf

  committed
  77bc591

• Mergeview: Adjust syncing

  Show description for 5f12315
  vidartf

  committed
  5f12315

• Fix manual edit tests for deleted cells

  vidartf

  committed
  718f13a

• Fix replaceArrayContent bug

  vidartf

  committed
  e99c846

• Add getMatchinBaseLine clipping

  vidartf

  committed
  ba24353

• Adjust merge styles

  Show description for 331dd41
  vidartf

  committed
  331dd41

• Avoid race condition in manual edit

  Show description for 315b08d
  vidartf

  committed
  315b08d

• Web: Don't combine diffs in flattenStringDiffs

  Show description for 981c1d3
  vidartf

  committed
  981c1d3

• Lint

  vidartf

  committed
  770ba83

• Manual edit: Affected diffs use offset of preceding

  vidartf

  committed
  b540e55

• Manual edit: Fix paths + decision combining

  vidartf

  committed
  2f061ac

• Fix bug in forceFourWayViews

  vidartf

  committed
  8d2ec89

• Manual edit: Simplify add/remove of full lines

  Show description for 7b0ceb6
  vidartf

  committed
  7b0ceb6

• Remove unused imports

  vidartf

  committed
  fee8b66

• ManualEdit: Fix bug when syncing last range

  vidartf

  committed
  c49c68a

• Remove decision + picker when picking base on edit

  Show description for 0d97fc9
  vidartf

  committed
  0d97fc9