Mitchell Rosen
cc48213b1b
distinguish between type and term dependencies in UF.dependencies
2024-08-13 14:05:22 -04:00
Mitchell Rosen
28543adcdd
reuse unique type guids in merge after all
2024-08-13 12:46:42 -04:00
Mitchell Rosen
4c30192553
inline Mergeblob2.conflictsNames and Mergeblob2.conflictsIds
2024-08-13 12:11:32 -04:00
Mitchell Rosen
7b315c3b34
delete unused Mergeblob2.lcaDeclNameLookup field
2024-08-13 12:05:52 -04:00
Mitchell Rosen
c230be29aa
move more code around
2024-08-08 12:19:53 -04:00
Mitchell Rosen
a40bfd64ad
move the rest of the mergeblobs over
2024-08-08 11:57:14 -04:00
mitchellwrosen
2b33116163
automatically run ormolu
2024-08-08 15:51:13 +00:00
Mitchell Rosen
3b37c4b349
move some of the mergeblob API over to unison-merge
2024-08-08 11:50:26 -04:00
Mitchell Rosen
d5a9585194
continue refactoring
2024-08-06 13:05:24 -04:00
Mitchell Rosen
4acee45238
extract PPE making to merge API
2024-08-05 14:11:42 -04:00
mitchellwrosen
2ffbba47c3
automatically run ormolu
2024-08-05 16:10:55 +00:00
Mitchell Rosen
565eb6625f
don't hydrate twice, and hyrate lca defns too
2024-08-05 12:10:16 -04:00
Mitchell Rosen
325e4ee4de
separate partitioning from asserting no builtins
2024-08-05 11:38:25 -04:00
mitchellwrosen
3f73d7fd89
automatically run ormolu
2024-08-01 22:16:38 +00:00
Mitchell Rosen
5bf55a4786
Merge branch '24-07-31-merge-refactor' into 24-08-01-merge-api
2024-08-01 18:15:57 -04:00
Mitchell Rosen
8041e25b83
tease apart identifyDependents
2024-08-01 18:15:02 -04:00
Mitchell Rosen
e89b0ae06b
⅄ 24-07-31-merge-refactor → 24-08-01-merge-api
2024-08-01 16:24:18 -04:00
Mitchell Rosen
acc63bff2b
generalize findConflictedAlias a bit
2024-08-01 16:23:31 -04:00
Mitchell Rosen
1c0d1a1ed1
delete MergeDatabase
2024-08-01 09:06:39 -04:00
Mitchell Rosen
2e328d2aaa
remove "old style" merge functions that take merge database as argument
2024-08-01 08:28:02 -04:00
Mitchell Rosen
2860665925
extract findConflictedAlias to Unison.Merge
2024-08-01 08:03:48 -04:00
Mitchell Rosen
9e4719e408
break up libdeps merge into diff and apply steps
2024-07-29 22:36:24 -04:00
Mitchell Rosen
43bfa09e43
make a Unison.Merge module that re-exports most of the merge API
2024-07-29 13:25:52 -04:00
Mitchell Rosen
3df6418512
⅄ update-defn-order → 24-07-24-diff-api
2024-07-29 13:06:51 -04:00
Mitchell Rosen
17c6c8e7c8
write pure version of lenientCheckDeclCoherency
2024-07-25 16:17:03 -04:00
Mitchell Rosen
daa97fd2cf
write pure version of checkDeclCoherency
2024-07-25 16:00:29 -04:00
Mitchell Rosen
0079f2a0dd
write pure version of nameBasedNamespaceDiff
2024-07-25 15:41:06 -04:00
Mitchell Rosen
f59c428b35
write pure version of synhashDefns
2024-07-25 14:42:45 -04:00
Mitchell Rosen
04c659de5d
write pure version of synhashLcaDefns
2024-07-25 14:27:24 -04:00
Mitchell Rosen
aea1660a07
simplify checkDeclCoherency again
2024-07-24 02:58:07 -04:00
Mitchell Rosen
e64ffb6f2c
⅄ trunk → update-defn-order
2024-07-24 02:40:13 -04:00
Mitchell Rosen
c7a55f0196
update work
2024-07-22 18:26:14 -04:00
Greg Pfeil
9ac6a04ec1
Inform Ormolu of some operator precedences
...
This adds a .ormolu file to tell Ormolu what some operator precedences
are, to improve indentation of multi-line operator sequences.
2024-07-18 19:44:34 -06:00
Greg Pfeil
b8f1ed988a
Run Ormolu over the entire codebase
...
With #5142 , Ormolu was upgraded from 0.5.2.0 to 0.7.2.0. This formats
the codebase to avoid spurious formatting comingled in other commits.
Almost all of the changes are simply wrapping single constraints in parens, like
```diff
-hashBranch :: forall m. Monad m => Branch m -> m BranchHash
+hashBranch :: forall m. (Monad m) => Branch m -> m BranchHash
```
There is also some reordering of language pragmas and imports,
indentation correction (some of which gets precedence wrong), and switching
some Haddock from `-- ^` to `-- |` .
2024-07-18 17:48:40 -06:00
Eduard Nicodei
6ed06f3089
Merge remote-tracking branch 'origin/trunk' into merged-ghc-upgrade-try-2
2024-07-15 18:21:33 +01:00
Arya Irani
9b11d96cbb
Merge pull request #5177 from unisonweb/24-07-01-todo-merge-precondition-violations
2024-07-10 13:28:59 -04:00
mitchellwrosen
d70b219058
automatically run ormolu
2024-07-09 15:48:21 +00:00
Mitchell Rosen
9cc6c2bd8a
synhash var bugfix: hash debruijn indexes, not var names
...
also adds a debug.synhash.term command for debugging
2024-07-09 11:47:27 -04:00
Mitchell Rosen
06b731b774
report constructor aliases in todo
2024-07-03 11:19:18 -04:00
Mitchell Rosen
fdf91bbce6
make decl coherency check more abstract to support "get all violations" use case
2024-07-02 17:44:09 -04:00
Mitchell Rosen
eb1ee64cf2
merge unison-util-nametree into unison-core1
2024-07-02 12:23:34 -04:00
Chris Penner
e94f8706fc
Remove Primes from module names
2024-06-27 12:16:53 -07:00
Mitchell Rosen
5353a4e64c
properly handle deleted constructors in merge
2024-06-20 14:31:40 -04:00
Chris Penner
035f75ab36
Merge trunk
2024-06-03 08:44:11 -07:00
Mitchell Rosen
899be60f5a
improve merge precondition violation output messages
2024-05-31 14:34:47 -04:00
Chris Penner
63f32a6144
Merge!
2024-05-30 15:56:27 -07:00
Chris Penner
6384038ee0
Don't expose Branch0 internals, (and add add lens utils to prelude)
2024-05-30 15:21:47 -07:00
Mitchell Rosen
32cde2cd35
relax merge preconditions on lca
2024-05-29 12:41:59 -04:00
Mitchell Rosen
52283ed3f7
minor cleanup
2024-05-29 10:38:13 -04:00
Mitchell Rosen
50334f262f
make "lenient" decl coherency check that can't fail
2024-05-29 10:21:39 -04:00
