Mitchell Rosen
28543adcdd
reuse unique type guids in merge after all
2024-08-13 12:46:42 -04:00
Arya Irani
ed555a3ea1
Merge branch 'trunk' into 24-08-01-merge-api
2024-08-13 10:50:02 -04:00
Arya Irani
d5d9d9d9ab
Merge pull request #5270 from unisonweb/arya/fix-3424
2024-08-10 00:37:32 -04:00
Arya Irani
c4f8ffcf39
clear latestTypecheckedFile on update
...
fixes #3424
2024-08-09 15:50:38 -04:00
Arya Irani
01cae7efdb
failing transcript
2024-08-09 15:44:35 -04:00
Chris Penner
c341cc431e
Add regression test
2024-08-09 10:58:47 -07:00
Mitchell Rosen
53209c3b69
more mergeblob work
2024-08-08 11:16:43 -04:00
Mitchell Rosen
565eb6625f
don't hydrate twice, and hyrate lca defns too
2024-08-05 12:10:16 -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
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
Arya Irani
9100b97e91
tweak output messages
2024-08-01 17:49:45 -04:00
Greg Pfeil
4803d446f1
Add some description to the new transcripts
2024-08-01 12:27:49 -06:00
Mitchell Rosen
2860665925
extract findConflictedAlias to Unison.Merge
2024-08-01 08:03:48 -04: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
Greg Pfeil
32472bd9e0
Allow EOF to close layout blocks
...
This removes the need to pad the lexer stream with trailing `Close` lexemes. If
EOF is reached, the parser will automatically close any layout blocks (but not
context-free blocks).
2024-07-27 00:52:11 -06:00
Greg Pfeil
80143eb9a2
Add transcripts for some already-fixed issues
...
This fixes #1327 (which was actually fixed by #5056 or #5061 ) and #3977
was already closed, but without the transcript to avoid regression.
2024-07-24 12:58:15 -06:00
Greg Pfeil
032e3609a0
Add some transcripts that should error, but don’t
2024-07-24 12:41:55 -06:00
Mitchell Rosen
e64ffb6f2c
⅄ trunk → update-defn-order
2024-07-24 02:40:13 -04:00
Mitchell Rosen
7506ae26b6
get transcripts passing
2024-07-23 13:45:16 -04:00
Chris Penner
1b22343c24
branch.reflog -> reflog
2024-07-22 15:00:47 -07:00
Chris Penner
5bedaf3d1a
Update transcripts
2024-07-22 11:06:42 -07:00
Greg Pfeil
00f6c8c954
Refactoring TranscriptParser
...
A bunch of small changes in TranscriptParser
- remove dead code
- don’t use `Show` for formatted output
- put processed blocks in a separate sum type from unprocessed blocks
- remove `Transcript` from identifiers (changed importers to use
`qualified as Transcript`)
- deduplicated some error reporting
And one happy fix, IMO – got rid of the `Text.init` that plagued me in
2024-07-16 19:31:01 -06:00
Eduard Nicodei
4e44b94ad6
update transcripts
2024-07-15 19:10:27 +01:00
Eduard Nicodei
6ed06f3089
Merge remote-tracking branch 'origin/trunk' into merged-ghc-upgrade-try-2
2024-07-15 18:21:33 +01:00
Chris Penner
670b0868b9
Port fix2254 to new update
2024-07-11 12:45:44 -07:00
Chris Penner
1e4f1abe73
Fix diff-helper to use the names from both branches
2024-07-11 12:33:19 -07:00
Chris Penner
987cd61976
Swap branch-relative-paths back to relative
2024-07-11 09:49:55 -07:00
Arya Irani
0cd3cd1cff
Merge branch 'trunk' into cp/project-root
...
# Conflicts:
# unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md
# unison-src/transcripts-round-trip/main.output.md
# unison-src/transcripts/add-run.output.md
# unison-src/transcripts/bug-strange-closure.output.md
# unison-src/transcripts/cycle-update-5.output.md
# unison-src/transcripts/delete.output.md
# unison-src/transcripts/diff-namespace.output.md
# unison-src/transcripts/move-namespace.output.md
# unison-src/transcripts/name-selection.output.md
# unison-src/transcripts/names.output.md
# unison-src/transcripts/namespace-dependencies.output.md
# unison-src/transcripts/propagate.output.md
# unison-src/transcripts/reflog.output.md
# unison-src/transcripts/reset.output.md
# unison-src/transcripts/tab-completion.output.md
# unison-src/transcripts/transcript-parser-commands.output.md
2024-07-10 23:49:04 -04:00
Greg Pfeil
bf442467a4
Merge remote-tracking branch 'upstream/trunk' into new-transcript-parser
2024-07-10 16:04:10 -06:00
Chris Penner
2f4e57d41b
Fix Upgrade
2024-07-10 14:31:56 -07:00
Greg Pfeil
179b8d1bb7
Terminate API code blocks correctly
...
They were missing trailing newlines, so as you can see in the diff, some
transcripts had invalid output.
2024-07-10 14:09:11 -06:00
Greg Pfeil
8416708a29
Add transcripts for fixed issues
...
This shows that this change fixes #1421 , #2826 , #5141 , and #5168 .
2024-07-10 14:01:35 -06:00
Greg Pfeil
b657d0dd50
Fix a few transcripts with incorrect Markdown
...
These weren’t errors in any way, but the `cmark`-produced outputs made
it clear that some of our transcripts weren’t formatted the way we
intended.
2024-07-10 13:56:10 -06:00
Greg Pfeil
0031542faf
Add a space before code block info strings
...
This is for consistency with the `cmark` style. Now the blocks we still
pretty-print ourselves will match the bulk of them that `cmark`
produces.
2024-07-10 13:56:07 -06:00
Greg Pfeil
1dc181b99a
Update the transcripts with cmark
...
`cmark`’s pretty-printer matches our output pretty well, with a few differences:
- it puts a space between the fence and the info string for in code blocks;
- it prefers `-` over `*` for bulleted lists (as do I) and it indents them;
- it `\`-escapes certain chars very conservatively;
- it prefers indented/unfenced code blocks if there is no info string; and
- it prefers `*` over `_` (unlike any sane person).
This also shows how the change fixes a number of issues:
- fix2158-1.output.md also illustrates how this change fixes #1809 ;
- alias-many.output.md and input-parse-errors.output.md show how fenced
code blocks without an info string would use the beginning of the
content as the info string;
- transcripts-round-trip/main.output.md shows how output blocks for
generated `unison` stanzas (which could contain nested fenced blocks)
might not have long-enough fences; and
- error-messages.output.md and generic-parse-errors.output.md show how
Unison errors were reported on the wrong line number (and thus the
printed error lines were also incorrect).
2024-07-10 13:37:51 -06:00
Chris Penner
f725bf218b
Fix names transcript
2024-07-10 11:05:13 -07:00
Chris Penner
fa6c59e68a
Fix merge transcript
2024-07-10 10:54:15 -07:00
Chris Penner
1cd3f3cff8
Fix move-namespace transcript
2024-07-10 10:52:39 -07: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
Mitchell Rosen
d78154d7c1
better rendering of conflicted names in todo
2024-07-09 18:58:42 -04:00
Chris Penner
736ccf1434
Merge trunk
2024-07-09 15:47:12 -07:00
Mitchell Rosen
1e5b925bca
adjust some output
2024-07-09 18:19:32 -04:00
Chris Penner
6fe6d673d2
Omit times from project reflogs
2024-07-09 14:51:18 -07:00
Arya Irani
615887fcf4
Merge pull request #5194 from unisonweb/synhash-bugfix
2024-07-09 14:25:25 -04:00
Mitchell Rosen
94c6bfca62
add transcript
2024-07-09 14:10:53 -04:00
