Code

feat/refactor: add merge api#5259

Code

Merged

aryairani merged 25 commits intotrunkunisonweb/unison:trunkfrom 24-08-01-merge-apiunisonweb/unison:24-08-01-merge-apiCopy head branch name to clipboardAug 13, 2024

+1,315-1,121

Commits

Commits on Aug 1, 2024

• extract findConflictedAlias to Unison.Merge

  mitchellwrosen

  committed
  2860665

  Copy full SHA for 2860665

• remove "old style" merge functions that take merge database as argument

  mitchellwrosen

  committed
  2e328d2

  Copy full SHA for 2e328d2

• delete MergeDatabase

  mitchellwrosen

  committed
  1c0d1a1

  Copy full SHA for 1c0d1a1

• generalize findConflictedAlias a bit

  mitchellwrosen

  committed
  acc63bf

  Copy full SHA for acc63bf

• ⅄ 24-07-31-merge-refactor → 24-08-01-merge-api

  mitchellwrosen

  committed
  e89b0ae

  Copy full SHA for e89b0ae

• tease apart identifyDependents

  mitchellwrosen

  committed
  8041e25

  Copy full SHA for 8041e25

• Merge branch '24-07-31-merge-refactor' into 24-08-01-merge-api

  mitchellwrosen

  committed
  5bf55a4

  Copy full SHA for 5bf55a4

• automatically run ormolu

  

  mitchellwrosen

  authored and

  github-actions[bot]

  committed
  3f73d7f

  Copy full SHA for 3f73d7f

Commits on Aug 5, 2024

• ⅄ trunk → 24-08-01-merge-api

  mitchellwrosen

  committed
  b946980

  Copy full SHA for b946980

• separate partitioning from asserting no builtins

  mitchellwrosen

  committed
  325e4ee

  Copy full SHA for 325e4ee

• don't hydrate twice, and hyrate lca defns too

  mitchellwrosen

  committed
  565eb66

  Copy full SHA for 565eb66

• automatically run ormolu

  

  mitchellwrosen

  authored and

  github-actions[bot]

  committed
  2ffbba4

  Copy full SHA for 2ffbba4

• extract PPE making to merge API

  mitchellwrosen

  committed
  4acee45

  Copy full SHA for 4acee45

• extract rendering conflicts and dependents to a helper

  mitchellwrosen

  committed
  816d785

  Copy full SHA for 816d785

• begin moving over to "mergeblob" api

  mitchellwrosen

  committed
  aedb9c2

  Copy full SHA for aedb9c2

Commits on Aug 6, 2024

• continue refactoring

  mitchellwrosen

  committed
  d5a9585

  Copy full SHA for d5a9585

• rename a couple things

  mitchellwrosen

  committed
  c88c4a3

  Copy full SHA for c88c4a3

Commits on Aug 8, 2024

• more mergeblob work

  mitchellwrosen

  committed
  53209c3

  Copy full SHA for 53209c3

• move some of the mergeblob API over to unison-merge

  mitchellwrosen

  committed
  3b37c4b

  Copy full SHA for 3b37c4b

• automatically run ormolu

  

  mitchellwrosen

  authored and

  github-actions[bot]

  committed
  2b33116

  Copy full SHA for 2b33116

• move the rest of the mergeblobs over

  mitchellwrosen

  committed
  a40bfd6

  Copy full SHA for a40bfd6

• move more code around

  mitchellwrosen

  committed
  c230be2

  Copy full SHA for c230be2

• delete unused import

  mitchellwrosen

  committed
  0d560d2

  Copy full SHA for 0d560d2

• ⅄ trunk → 24-08-01-merge-api

  mitchellwrosen

  committed
  1741ffb

  Copy full SHA for 1741ffb

Commits on Aug 13, 2024

• Merge branch 'trunk' into 24-08-01-merge-api

  aryairani

  committed
  ed555a3

  Copy full SHA for ed555a3