Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New EXPERIMENTAL command to sync file state with codebase #5030

Draft
wants to merge 12 commits into
base: trunk
Choose a base branch
from
Draft

New EXPERIMENTAL command to sync file state with codebase #5030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1ac902
Add onlyLib combinator to Branch
ChrisPenner May 29, 2024
41ab309
Add 'commit' command
ChrisPenner May 29, 2024
9d0cde7
Alter behaviour of load, including UNISON_LOAD_MODE env var
ChrisPenner May 29, 2024
aee789a
Try to improve commit output
ChrisPenner May 29, 2024
5806939
Merge new Branch invariants with commit command
ChrisPenner May 31, 2024
2477b09
Fix merge conflicts
ChrisPenner May 31, 2024
8b1265e
Merge loadForCommit
ChrisPenner May 30, 2024
85a18a0
Clean up commit command
ChrisPenner May 31, 2024
f76d5e0
Add type lookup for typechecked files
ChrisPenner May 31, 2024
bd7802b
Add experimental.commit.preview
ChrisPenner May 31, 2024
0adc6f3
Fix up commit.preview and accidentally ignoring top-level terms
ChrisPenner May 31, 2024
f914250
Adjust transcripts to non-erroring diff.namespace
ChrisPenner May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix merge conflicts
  • Loading branch information
@ChrisPenner
ChrisPenner committed May 31, 2024
commit 2477b09db193dbd0bf112b5fc348c89bc210b36d
6 changes: 4 additions & 2 deletions parser-typechecker/src/Unison/Codebase/Branch.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ withoutTransitiveLibs b0 =
in b0 & children .~ newChildren

onlyLib :: Branch0 m -> Branch0 m
onlyLib Branch0 {..} =
branch0 _terms _types (Map.singleton NameSegment.libSegment (fromMaybe empty $ Map.lookup NameSegment.libSegment _children)) _edits
onlyLib b =
b
& children %~ \c ->
(Map.singleton NameSegment.libSegment (fromMaybe empty $ Map.lookup NameSegment.libSegment c))

-- | @deleteLibdep name branch@ deletes the libdep named @name@ from @branch@, if it exists.
deleteLibdep :: NameSegment -> Branch0 m -> Branch0 m
Expand Down
2 changes: 1 addition & 1 deletion unison-cli/src/Unison/CommandLine/InputPatterns.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ commit =
)
\case
[] -> pure $ Input.CommitI Nothing
[file] -> pure $ Input.CommitI . Just $ file
[file] -> Input.LoadI . Just <$> unsupportedStructuredArgument "a file name" file
_ -> Left (I.help load)

update :: InputPattern
Expand Down