Commit Graph

16271 Commits

Author SHA1 Message Date
Chris Penner
815c1b1f1c
Auto-create project-branches referenced in transcript prompts (#5077) 2024-06-12 09:28:12 -04:00
Arya Irani
335512e331
fix conflicted alias message 2 (#5071)
Co-authored-by: aryairani <aryairani@users.noreply.github.com>
2024-06-11 09:40:43 -04:00
Arya Irani
a45fc88fb1
Update merge precondition message: Conflicted aliases (#5070) 2024-06-10 20:42:01 -04:00
Arya Irani
7a70400443
Update issue templates 2024-06-10 16:45:45 -04:00
Arya Irani
a5f522ec8e
Merge pull request #5064 from unisonweb/aryairani-issue-templates 2024-06-10 16:22:52 -04:00
Arya Irani
433be000b2
Merge pull request #5068 from unisonweb/24-05-30-edit-namespace-no-record-accessors 2024-06-10 16:22:35 -04:00
Mitchell Rosen
72bdd9185f amend edit.namespace transcript 2024-06-10 15:49:02 -04:00
Mitchell Rosen
e1802a1e2a make edit.namespace not put record accessors 2024-06-10 15:35:15 -04:00
Mitchell Dalvi Rosen
470f8bcb78
Merge pull request #5067 from unisonweb/conflicted-alias-update-delete-bug
bugfix: updating and deleting aliases erroneously tripped "conflicted alias" merge precondition
2024-06-10 14:49:30 -04:00
Mitchell Rosen
e3440a91c6 don't consider update+delete a conflicted alias 2024-06-10 13:57:22 -04:00
Mitchell Rosen
528c2a1cd6 commit failing transcript 2024-06-10 13:56:12 -04:00
Arya Irani
c758076b70
Merge pull request #5065 from unisonweb/show-push-auth-error-message 2024-06-10 12:06:17 -04:00
Mitchell Rosen
5f222b7750 rearrange when we put an upload failure message so it doesn't disappear 2024-06-10 10:43:52 -04:00
Arya Irani
ab8ef8b432
Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Simon Højberg <r.hackr@gmail.com>
2024-06-10 10:32:48 -04:00
Arya Irani
294ebb8e79
Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Simon Højberg <r.hackr@gmail.com>
2024-06-10 10:32:42 -04:00
Arya Irani
4c528fd3bf
Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Simon Højberg <r.hackr@gmail.com>
2024-06-10 10:25:49 -04:00
Arya Irani
f50aa45d1a
Create issue templates 2024-06-10 10:04:53 -04:00
Arya Irani
922b41201a
Merge pull request #5061 from sellout/ls-fixes 2024-06-07 09:50:36 -04:00
Greg Pfeil
e32138c215
Treat Name as Path' in InputPattern handlers
This fixes an issue where `ls` results couldn’t be used as numbered args by commands which expected a `Path`.
2024-06-07 00:40:16 -05:00
Greg Pfeil
24ff8b5cb0
Show that you can’t ls the results of ls 2024-06-07 00:17:44 -05:00
Greg Pfeil
ce33057385
Refine Path-prefixing operations
This replaces `prefix :: Absolute -> Path' -> Path` with a couple
alternatives:
- `prefixAbs :: Absolute -> Relative -> Absolute`,
- `maybePrefix :: Path' -> Path' -> Maybe Path'`, and
- `prefix :: Path' -> Relative -> Path'`.

The previous `prefix` could fail to prefix (covered by either the new
`prefix` or `maybePrefix`, depending on whether you want to guarantee
success or capture failure), always threw away the knowledge that the
result was necessarily `Absolute` (covered by `prefixAbs`), and then
always returned an ambiguous result type (covered by all three
replacements).

Then it also provides `prefixRel` as the complement of `prefixAbs` (both
of which are used in the implementation of `prefix`).

Similar changes are made in the replacements for `prefixName :: Absolute
-> Name -> Name`. First, we don’t currently have absolute/relative
variants of `Name`, so we can generalize the first argument to `Path'`.
Then `maybePrefixName :: Path' -> Name -> Maybe Name` exposes the case
where prefixing can’t succeed, and `prefixNameIfRel :: Path' -> Name ->
Name` handles the common case of using the original `Name` if it can’t
be prefixed. Both of these new functions also preserve the `Position` of
the new `Name`, whereas the old implementation always returned a
`Relative` `Name`, despite knowing when it was `Absolute`. And
`prefixName2 :: Path -> Name -> Name` has been removed as there is no
ambiguous variant of `Name` (as `Split` is to `Split'`), so prefixing
with a `Path` isn’t particularly meaningful.

Finally, `nameFromSplit'` is added as a dual to `splitFromName'` to make
it possible to operate on the `Path'` portion of a `Name` without introducing partiality.

These new operations are then propagated through the code, and enable a
couple other type changes: `StructuredArgument.ShallowListEntry` and
`StructuredArgument.SearchResult` now take a `Path'` prefix rather than
the `Path.Absolute` and `Path` prefixes they took previously. This fixes
the absolute `Name` issue in `ls` results.
2024-06-06 23:53:00 -05:00
Greg Pfeil
3c197c51c8
Use a project in fix5055 transcript
This makes the absolute path problem more obvious.
2024-06-06 23:26:13 -05:00
Arya Irani
80a563fe3b
Merge pull request #5056 from sellout/shallowlistentry-fix 2024-06-05 21:56:14 -04:00
Greg Pfeil
cf6ab11088
Ensure Names are absolute after prefixing
In a separate part of the change this PR was extracted from,
`Path.prefixName` ensures the result is absolute, but that is more
involved than other changes here, so this uses the previous technique of
calling `Name.makeAbsolute` afterward.

I don’t think this changes anything important, but the `Name` _is_
always absolute after `Path.prefixName`, so this just ensures that it’s
tracked.
2024-06-05 11:18:29 -06:00
Greg Pfeil
4c12fe8a47
Make the transcript for #5055 more stable 2024-06-05 11:07:55 -06:00
Greg Pfeil
8ef107817d
Support ShallowListEntry in InputPattern handlers
These are produced by `ls`, but weren’t included in the handlers, so the
results of `ls` weren’t usable as numbered args.

Fixes #5055.
2024-06-05 10:58:54 -06:00
Greg Pfeil
529ae7f174
Add a failing transcript for #5055 2024-06-05 10:51:35 -06:00
Greg Pfeil
cab24bbb28
Remove partiality from hqSplitFromName'
This function previously converted the `Name` to a `Path'`, so
recovering the `Name` became partial. It now goes through `Split'`
instead of `Path'`, preserving the guaranteed segment.
2024-06-05 10:51:29 -06:00
Arya Irani
3d8eca4850
Merge pull request #5051 from unisonweb/autoformat/trunk 2024-06-04 20:36:21 -04:00
aryairani
0247854e70 [create-pull-request] automated change 2024-06-04 18:34:00 +00:00
Arya Irani
b44044a4b0
Merge pull request #5050 from unisonweb/fix-launcher-script-2 2024-06-04 13:51:18 -04:00
Arya Irani
63fa3fdca6 the --ui flag conflicts with commands, like transcript 2024-06-04 13:20:49 -04:00
Arya Irani
2540774b2f
Merge pull request #5042 from sellout/numbered-args-delete.namespace 2024-06-04 11:11:41 -04:00
Arya Irani
0b7b604ced
Merge pull request #5038 from atroche/tiny-adddotrun-docstring-typo 2024-06-04 11:10:29 -04:00
Arya Irani
c10faef729
Merge pull request #5048 from unisonweb/fix-launcher-ui 2024-06-04 11:09:07 -04:00
Arya Irani
4af265f345
Merge pull request #5046 from unisonweb/24-06-03-pull-error-messages 2024-06-04 11:08:19 -04:00
Arya Irani
8a1ea75bf9 pass --ui flag in default launcher 2024-06-04 10:40:12 -04:00
Arya Irani
7efaaef80e was aiming for the implied project/branch name, but dunno how 2024-06-04 10:33:58 -04:00
Mitchell Rosen
d0ab586b9a ⅄ trunk → 24-06-03-pull-error-messages 2024-06-03 20:27:40 -04:00
Mitchell Rosen
9e04ffc9ee improve pull into non-existent branch error message 2024-06-03 20:19:54 -04:00
Mitchell Rosen
75cf28d4dd some better error messages when trying to pull into a path 2024-06-03 19:44:57 -04:00
Arya Irani
78dae4ff07
Merge pull request #5039 from unisonweb/24-05-20-upgrade-commit 2024-06-03 19:35:15 -04:00
Mitchell Rosen
f0d2c84c48 tmp 2024-06-03 18:10:10 -04:00
Arya Irani
32fba96c83
Merge pull request #5036 from sellout/add-nix-checks 2024-06-03 18:06:38 -04:00
Arya Irani
1cb243767f
require CONTRIBUTORS.md to automerge 2024-06-03 14:16:23 -04:00
Mitchell Rosen
6f1c56c131 tweak messages 2024-06-03 13:57:45 -04:00
Greg Pfeil
811c9e70bb
Clean up the transcript and see that it passes
The issue had already been fixed at some point.

Closes #1532.
2024-06-03 11:56:33 -06:00
Greg Pfeil
2bf53bc3ae
Add transcript from issue #1532
Unfortunately, the linked transcript doesn’t contain text, AFAICT. So
this copies over the issue text, but that is also missing some
information.
2024-06-03 11:43:21 -06:00
mergify[bot]
5502a37a62
Merge pull request #5027 from unisonweb/cp/fix-branch-invariants
Fix branch invariants
2024-06-03 16:08:04 +00:00
Chris Penner
035f75ab36 Merge trunk 2024-06-03 08:44:11 -07:00