16999 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mitchell Rosen	1741ffbbd6	⅄ trunk → 24-08-01-merge-api	2024-08-08 14:55:17 -04:00
Chris Penner	bcf0ff68f4	Only emit annotation changes if it's a hash change	2024-08-08 11:34:33 -07:00
Mitchell Rosen	0d560d209a	delete unused import	2024-08-08 13:34:18 -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	53209c3b69	more mergeblob work	2024-08-08 11:16:43 -04:00
Mitchell Rosen	c88c4a3643	rename a couple things	2024-08-06 13:25:02 -04:00
Mitchell Rosen	d5a9585194	continue refactoring	2024-08-06 13:05:24 -04:00
Arya Irani	4c3eb03079	Merge pull request #5257 from unisonweb/24-07-24-diff-api	2024-08-06 16:01:41 +00:00
Mitchell Rosen	aedb9c2e43	begin moving over to "mergeblob" api	2024-08-05 15:48:12 -04:00
Mitchell Rosen	816d785b8d	extract rendering conflicts and dependents to a helper	2024-08-05 14:34:36 -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
Mitchell Rosen	7909114218	⅄ trunk → 24-07-24-diff-api	2024-08-05 10:41:06 -04:00
Mitchell Rosen	b94698057d	⅄ trunk → 24-08-01-merge-api	2024-08-05 10:38:38 -04:00
Arya Irani	f63cfbeadb	Merge pull request #5252 from sellout/test-1327	2024-08-03 23:46:39 +00:00
Arya Irani	c049c65ad7	Merge pull request #5187 from sellout/doc-lexer	2024-08-03 23:45:30 +00:00
Arya Irani	97c9109291	Merge pull request #5250 from unisonweb/update-defn-order	2024-08-02 22:22:37 +00:00
Arya Irani	69886f44a4	Merge pull request #5264 from unisonweb/nix-tmate	2024-08-02 22:21:39 +00:00
Arya Irani	6cb39c8838	Update .github/workflows/nix-dev-cache.yaml ... Co-authored-by: Greg Pfeil <greg@technomadic.org>	2024-08-02 16:00:20 -04:00
Chris Penner	c32bb936d5	Merge pull request #5265 from unisonweb/lsp/fix-unused-bindings-in-cases ... Fix unused-binding-detection in case patterns	2024-08-02 12:59:37 -07:00
Arya Irani	d7ac7c6031	Update .github/workflows/nix-dev-cache.yaml	2024-08-02 15:48:33 -04:00
Arya Irani	02f9eb7eed	Update .github/workflows/nix-dev-cache.yaml ... Co-authored-by: Greg Pfeil <greg@technomadic.org>	2024-08-02 15:43:05 -04:00
Arya Irani	d903fd2401	Update nix-dev-cache.yaml	2024-08-02 14:32:57 -04:00
Arya Irani	d12176f2bb	Update nix-dev-cache.yaml	2024-08-02 14:14:48 -04:00
Arya Irani	a26a31a7cd	Update nix-dev-cache.yaml	2024-08-02 14:13:47 -04:00
Chris Penner	3e87dc3854	Fix unused-binding-detection in case patterns	2024-08-02 10:57:16 -07:00
Arya Irani	ac75905f8b	debug nix-dev-cache	2024-08-02 13:44:31 -04:00
Arya Irani	d184ac1f74	Merge pull request #5262 from unisonweb/update-defn-order-tweak	2024-08-02 17:33:40 +00:00
Greg Pfeil	1ee188d0e3	Merge remote-tracking branch 'upstream/trunk' into doc-lexer	2024-08-01 23:01:02 -06:00
Greg Pfeil	96f865b37c	Add a transcript showing that #5076 was fixed ... Some handling of blocks without final newlines was improved in the course of this PR. Fixes #5076.	2024-08-01 22:58:13 -06:00
Greg Pfeil	c5a66d5608	Simplify Doc parser from State to Reader	2024-08-01 22:52:54 -06: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
Arya Irani	8a3e2efafc	Merge pull request #5258 from unisonweb/cp/global-search	2024-08-01 21:56:22 +00:00
Arya Irani	9100b97e91	tweak output messages	2024-08-01 17:49:45 -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
Greg Pfeil	4803d446f1	Add some description to the new transcripts	2024-08-01 12:27:49 -06: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
ChrisPenner	8c9c3baad8	automatically run ormolu	2024-08-01 00:17:33 +00:00
Chris Penner	f9db384df1	Fix transcripts	2024-07-31 17:16:18 -07:00
Chris Penner	e545e0b1a7	Rerun transcripts	2024-07-31 16:41:00 -07:00