diff --git a/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs b/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs index b27f2b32fe..05127aa007 100644 --- a/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs +++ b/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs @@ -926,12 +926,16 @@ diffNamespace :: InputPattern diffNamespace = InputPattern "diff.namespace" [] - [(Required, pathArg), (Required, pathArg)] + [(Required, pathArg), (Optional, pathArg)] (P.column2 [ ( "`diff.namespace before after`" , P.wrap "shows how the namespace `after` differs from the namespace `before`" ) + , ( "`diff.namespace before`" + , P.wrap + "shows how the current namespace differs from the namespace `before`" + ) ] ) (\case @@ -939,6 +943,9 @@ diffNamespace = InputPattern before <- Path.parsePath' before after <- Path.parsePath' after pure $ Input.DiffNamespaceI before after + [before] -> first fromString $ do + before <- Path.parsePath' before + pure $ Input.DiffNamespaceI before Path.currentPath _ -> Left $ I.help diffNamespace ) diff --git a/unison-src/transcripts/diff.md b/unison-src/transcripts/diff.md index 9183a695f8..5846af90c1 100644 --- a/unison-src/transcripts/diff.md +++ b/unison-src/transcripts/diff.md @@ -19,6 +19,7 @@ fslkdjflskdjflksjdf = 663 .b0> add .> merge b0 b1 .> diff.namespace b1 b2 +.b2> diff.namespace .b1 ``` Things we want to test: diff --git a/unison-src/transcripts/diff.output.md b/unison-src/transcripts/diff.output.md index 6d9d7519f6..cda20f1fcb 100644 --- a/unison-src/transcripts/diff.output.md +++ b/unison-src/transcripts/diff.output.md @@ -69,6 +69,22 @@ fslkdjflskdjflksjdf = 663 6. fslkdjflskdjflksjdf#4kipsv2tm6 ┘ 7. fslkdjflskdjflksjdf (added) 8. fslkdjflskdjflksjdf#4kipsv2tm6 (removed) +.b2> diff.namespace .b1 + + Resolved name conflicts: + + 1. ┌ fslkdjflskdjflksjdf#4kipsv2tm6 : Nat + 2. └ fslkdjflskdjflksjdf#s5tu4n7rlb : Nat + ↓ + 3. fslkdjflskdjflksjdf#4kipsv2tm6 : Nat + + Name changes: + + Original Changes + 4. x ┐ 5. abc (added) + 6. fslkdjflskdjflksjdf#4kipsv2tm6 ┘ 7. fslkdjflskdjflksjdf (added) + 8. fslkdjflskdjflksjdf#4kipsv2tm6 (removed) + ``` Things we want to test: