Skip to content

properly handle hashes and numbered args in branch.diff arg parser #6142

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

Merged
aryairani merged 4 commits into from
Jan 27, 2026
+67 −204
Merged

properly handle hashes and numbered args in branch.diff arg parser #6142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b7cc21
properly handle hashes and numbered args in branch.diff arg parser
mitchellwrosen Jan 26, 2026
dbadcfa
clean up existing transcript
mitchellwrosen Jan 27, 2026
fc36030
add transcript demonstrating hash arguments work
mitchellwrosen Jan 27, 2026
353bb2c
tweak transcript to show numbered args to hashes work
mitchellwrosen Jan 27, 2026
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
14 changes: 11 additions & 3 deletions unison-cli/src/Unison/CommandLine/InputPatterns.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2488,10 +2488,18 @@ diffBranch =
args -> wrongArgsLength "two arguments" args
}
where
-- TODO handle causal hash
handleDiffBranchTargetArg :: I.Argument -> Either (P.Pretty P.ColorText) Input.DiffBranchArg
handleDiffBranchTargetArg arg =
Input.DiffBranchArg'Branch <$> handleMaybeProjectBranchArg arg
handleDiffBranchTargetArg = \case
I.RawArg raw ->
if take 1 raw == "#"
then case Input.parseShortCausalHash raw of
Right sch -> Right (Input.DiffBranchArg'Hash sch)
Left err -> Left (P.string err)
else megaparse (Input.DiffBranchArg'Branch <$> branchWithOptionalProjectParser) (Text.pack raw)
I.StructuredArg sa -> case sa of
SA.ProjectBranch pb -> Right (Input.DiffBranchArg'Branch pb)
SA.Namespace hash -> Right (Input.DiffBranchArg'Hash (SCH.fromFullHash hash))
otherArgType -> Left (wrongStructuredArgument "a branch or hash" otherArgType)

diffNamespace :: InputPattern
diffNamespace =
Expand Down
Loading