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
1e4f1abe73
Fix diff-helper to use the names from both branches
2024-07-11 12:33:19 -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
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
4c89423ef1
Rerun transcripts
2024-07-05 17:11:22 -07:00
Chris Penner
7dbb365a12
Convert diff-namespaces.md to project-root
2024-07-02 10:28:59 -07:00
Chris Penner
b636068ebd
Partially update diff-namespace
2024-07-01 23:35:58 -07:00
Chris Penner
5f78557170
Solve conflicts
2024-07-01 14:30:55 -07:00
Mitchell Rosen
831c2e0e06
in diff-namespace.md, replace uses of merge.old with debug.alias.term.force
2024-06-27 11:30:17 -04:00
Chris Penner
87bd96963e
Inline nosync versions into their regular forms so people aren't tempted to use them.
2024-06-05 15:31:15 -07:00
Mitchell Rosen
1442dc02ac
fix up a couple transcripts
2024-05-24 11:08:44 -04:00
Mitchell Rosen
6adb88f5b3
delete a bunch of patch manipulation commands
2024-05-24 11:01:45 -04:00
Mitchell Rosen
831005eaf3
⅄ trunk → topic/merge4
2024-05-01 13:26:43 -04:00
Arya Irani
2cf96a36ae
deprecate cd
, up
; add find-in
( #4883 )
...
* deprecate `cd`, `up`, hide `reset-root`, add `find-in`, hides unimplemented `update.builtins`
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
2024-04-28 21:30:02 -04:00
Mitchell Rosen
d37bce3e7e
rename and hide old merge commands
2024-04-24 12:29:15 -04:00
Chris Penner
5520a5b881
Update transcripts
2024-01-12 10:19:02 -08:00
Arya Irani
3b5ce64bcf
Merge branch 'trunk' into unorsk/unique-as-default-type-modifier
...
# Conflicts:
# unison-src/transcripts/diff-namespace.output.md
# unison-src/transcripts/docs.output.md
2024-01-05 14:15:22 -10:00
andrii
4456c95c7a
Fixing test for type modifiers, updating trnscripts
2024-01-04 09:42:12 +01:00
Mitchell Rosen
b7d43cf40f
remove a bunch of metadata-related code
2024-01-03 20:44:55 -05:00
andrii
8b857b152c
Adding a message for when ucm started reloading changes
2023-12-22 12:55:24 +01:00
Travis Staton
fcf98da49d
don't indicate that we will update aliases
2023-11-08 12:11:16 -05:00
Travis Staton
ab072c7960
fix transcripts
2023-11-08 11:54:50 -05:00
Chris Penner
c23be69057
Update transcript output
2023-05-17 11:36:58 -06:00
Travis Staton
745ed7929f
update transcripts
2022-12-07 14:46:32 -05:00
Travis Staton
eb4403f8f4
Remove diff from delete{.term,.type} output
...
fixes #3395
add delete{.term,.type}.verbose variants with the old behavior
2022-12-06 12:28:21 -05:00
Mitchell Rosen
7619f33921
update diff-namespace.md transcript
2022-08-31 14:23:50 -04:00
Paul Chiusano
bf71fd477a
transcript refresh
2022-04-06 16:20:44 -05:00
Chris Penner
3e3b44d1d1
Merge branch 'trunk' into topic/rehash-codebase
2022-02-14 13:31:57 -06:00
Chris Penner
4e9012f019
Merge branch 'trunk' into cp/numbered-history
2022-02-10 12:39:52 -06:00
Chris Penner
be57a82d4f
Add numbered output to view.patch
( #2875 )
...
* Number 'view.patch' output
* Add numbering to patches
* Change transcript to use numbers rather than hashes
* Update transcripts
* use short-hash as lhs of patch outputs in numberedArgs
2022-02-09 16:01:52 -06:00
Chris Penner
e70c072bb1
Refresh transcripts with history numbering
2022-02-08 15:12:00 -06:00
Chris Penner
3985108b15
Fix bad hashes in diff-namespace.md
2021-12-14 15:02:51 -06:00
Chris Penner
9c225cb08d
Merge branch 'trunk' into topic/rehash-codebase-merge-trunk
2021-12-14 12:40:18 -06:00
Chris Penner
fea12ee786
Merge branch 'trunk' into cp/diff-namespace-hashes
2021-11-29 10:26:54 -06:00
Chris Penner
51b670b2bc
Remove redundant message
2021-11-24 13:08:50 -06:00
Chris Penner
e09b587dae
Add namespace hash diffing to transcript
2021-11-24 10:42:51 -06:00