Mitchell Rosen
bbb04d9da2
get the transcripts passing (but a couple are still broken)
2024-08-26 13:37:19 -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
081f344578
Fix delete.md
2024-07-01 22:21:14 -07:00
Mitchell Rosen
df9e78138f
in delete.md, replace uses of merge.old with debug.alias.{term,type}.force
2024-06-27 11:12:21 -04:00
Paul Chiusano
d4a2ed9066
Switch to foo() with no space as preferred syntax instead of !foo
2024-06-20 16:52:57 -05:00
Mitchell Rosen
d37bce3e7e
rename and hide old merge commands
2024-04-24 12:29:15 -04:00
Chris Penner
e50f57f542
Merge remote-tracking branch 'origin/trunk' into cp/remove-global-names-again
2024-01-08 13:42:00 -08:00
Chris Penner
22ac9fc82a
Update delete transcripts
2024-01-08 12:02:10 -08:00
Mitchell Rosen
b7d43cf40f
remove a bunch of metadata-related code
2024-01-03 20:44:55 -05:00
Chris Penner
c23be69057
Update transcript output
2023-05-17 11:36:58 -06:00
Rebecca Mark
64e794c4e1
adds better error reporting if users try to delete term which does not exist
2023-02-02 22:50:11 -08:00
Rebecca Mark
1b4fca639b
Adds working multi-deletion command
2023-02-02 16:50:01 -08: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
Paul Chiusano
bf71fd477a
transcript refresh
2022-04-06 16:20:44 -05:00
Arya Irani
19daa28398
Merge branch 'trunk' into topic/merge-trunk-2022-02-07
2022-02-07 19:29:57 -07:00
Arya Irani
52b2c81783
never assume builtins are known to the db
...
fixes 107 failing transcripts
2021-12-06 11:55:21 -10:00
rlmark
79ad0fa8df
updates transcripts
2021-08-23 14:05:37 -07:00
Paul Chiusano
04dc85170b
check in some uncontroversial transcript diffs
2021-08-02 23:05:36 -04:00
Joseph Thomas
82617d7816
Update transcript test to reflect new behaivor.
2020-07-26 18:38:03 -06:00
Runar Bjarnason
d492640856
Name conflict output is slightly different
2020-06-19 15:04:49 -04:00
Paul Chiusano
59e55f0337
Fix #1225
...
Uses a post-order traversal of the branch, rebuilding from the bottom up and visiting each node exactly once.
2020-03-09 22:27:01 -04:00
Arya Irani
abfe928f61
replace auto-derived Ord HQ instance which had ordered z before a#x
...
new Ord HQ instance does order `#x` before `a#x`, though.
2020-02-11 20:51:55 -05:00
Arya Irani
72832815eb
updated MergeLocalBranchI to use two updates, and not print todo
...
implement added Lens.Cons and Lens.Snoc instances (closes #1200 ):
instance Cons Path Path NameSegment NameSegment
instance Snoc Relative Relative NameSegment NameSegment
instance Snoc Absolute Absolute NameSegment NameSegment
instance Snoc Path Path NameSegment NameSegment
instance Snoc Path' Path' NameSegment NameSegment
and class Path.Resolve l r where
resolve :: l -> r -> l
with
instance Resolve Path Path
instance Resolve Relative Relative
instance Resolve Absolute Relative
instance Resolve Path' Path'
instance Resolve Path' Split'
instance Resolve Absolute Path'
2020-02-06 00:05:34 -05:00
Arya Irani
2aedaa2e2f
remove traces and fix OBD.isEmpty
2020-01-16 16:58:31 -05:00
Arya Irani
96c556ca8b
tried to fix regression in Update vs Add/Remove, but not quite there yet.
2020-01-16 13:26:28 -05:00
Mitchell Rosen
764b2f4ae8
Show term/type hashes (for adds/removes) in diff output, if ambiguous
2019-12-15 09:13:48 -05:00
Mitchell Rosen
c4a10bbe53
Show branch diff after delete
2019-12-14 23:06:27 -05:00
Mitchell Rosen
df0fc25a18
Improve delete term/type feedback
2019-12-09 22:35:29 -05:00
Mitchell Rosen
6d8ea064c1
Add 'delete' command, which combines 'delete.term' and 'delete.type'
2019-12-08 17:29:47 -05:00
