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
cbd533e40f
Update a couple transcripts to the new formatting
...
These aren‘t run as part of ./scripts/check.sh, so they got missed in the initial pass.
2024-07-10 16:05:19 -06: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
Chris Penner
bf20459954
Typo
2024-07-10 14:29:27 -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
Chris Penner
67a41cdaf1
Docs and transcripts
2024-07-10 10:37:08 -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
Chris Penner
c625e47f89
Add undo.md transcript
2024-07-08 12:02:52 -07:00
Arya Irani
b14931f7b4
avoid numeric vs textual clash in args length error
...
`numerals` doesn't seem to be maintained anymore, however
2024-07-06 14:37:55 -04:00
Chris Penner
69edceffdf
Fix up round-trip tests
2024-07-05 18:20:17 -07:00
Chris Penner
424b43b897
Fix up reset transcripts for projects
2024-07-05 17:37:10 -07:00
Chris Penner
d0002b45c9
Disable view.global transcript for now
2024-07-05 17:36:59 -07:00
Chris Penner
4c89423ef1
Rerun transcripts
2024-07-05 17:11:22 -07:00
Chris Penner
dd81f0aa95
disable names.global transcript for now
2024-07-05 17:07:40 -07:00
Chris Penner
49258bc343
Merge trunk
2024-07-05 16:55:07 -07:00
Arya Irani
293b4a2948
Merge pull request #5182 from unisonweb/cp/improve-lsp-completion
2024-07-05 15:59:13 -04:00
Arya Irani
8be432be1b
change a punctuation
2024-07-05 15:10:28 -04:00
Chris Penner
deaf355f83
Improve LSP completion sorting
2024-07-05 11:56:31 -07:00
Greg Pfeil
0e76597e51
Merge remote-tracking branch 'upstream/trunk' into better-CLI-error-messages
2024-07-05 11:43:33 -06:00
Greg Pfeil
a7f1c24b57
Update transcript outputs
2024-07-05 11:28:27 -06:00
Arya Irani
38a73da600
switch Left to Right on help outputs; add draft transcripts
2024-07-05 11:33:11 -04:00
Chris Penner
8a405e02d2
Update reflog command WIP
2024-07-03 16:43:34 -07:00
Chris Penner
a7820feeac
Deprecate root reflog behaviour in favour of project/branch reflogs
2024-07-03 11:52:52 -07:00
Chris Penner
1dab376523
Fix behaviour of deleting last project or branch
2024-07-03 11:21:59 -07:00
Mitchell Rosen
8ff7e6d92d
⅄ trunk → 24-07-01-todo-merge-precondition-violations
2024-07-03 11:59:33 -04:00
Mitchell Rosen
05d34024bd
report stray constructors in todo
2024-07-03 11:59:17 -04:00
Mitchell Rosen
1857640da4
report nested decl aliases in todo
2024-07-03 11:53:45 -04:00
Mitchell Rosen
052fd51948
report missing constructor names in todo
2024-07-03 11:38:33 -04:00
Mitchell Rosen
06b731b774
report constructor aliases in todo
2024-07-03 11:19:18 -04:00
Chris Penner
2331c16770
Mostly Fix up deleting the branch you're on
2024-07-02 15:36:53 -07:00
Chris Penner
e9f2aa3ec5
Un-ignore transcript-parser-commands.md and fix it.
2024-07-02 15:36:53 -07:00
Chris Penner
5c675df566
Revive ability to delete root namespace
2024-07-02 10:53:28 -07:00
Chris Penner
7dbb365a12
Convert diff-namespaces.md to project-root
2024-07-02 10:28:59 -07:00
