unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-04 21:57:25 +03:00
Code Issues Projects Releases Wiki Activity

Fix base-pull location

Browse Source
This commit is contained in:
Chris Penner 2022-07-08 12:11:32 -06:00
parent 97c6ae6d4b
commit e60f12ab4f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unison-cli/src/Unison/Codebase/Editor/VersionParser.hs
View File

@ -14,18 +14,18 @@ import qualified Unison.Codebase.Path as Path
-- | Parse git version strings into valid unison namespaces.
--
-- >>> parseMaybe defaultBaseLib "release/M1j"
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.dev.base.releases._M1j})
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.base.releases._M1j})
--
-- >>> parseMaybe defaultBaseLib "release/M1j.2"
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.dev.base.releases._M1j_2})
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.base.releases._M1j_2})
--
-- >>> parseMaybe defaultBaseLib "latest-1234"
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.dev.base.trunk})
-- Just (ReadShareRemoteNamespace {server = DefaultCodeserver, repo = "unison", path = public.base.latest})
defaultBaseLib :: Parsec Void Text ReadShareRemoteNamespace
defaultBaseLib = fmap makeNS $ latest <|> release
where
latest, release, version :: Parsec Void Text Text
latest = "latest-" *> many anySingle *> eof $> "trunk"
latest = "latest-" *> many anySingle *> eof $> "latest"
release = fmap ("releases._" <>) $ "release/" *> version <* eof
version = do
Text.pack <$> some (alphaNumChar <|> ('_' <$ oneOf ['.', '_', '-']))
@ -34,5 +34,5 @@ defaultBaseLib = fmap makeNS $ latest <|> release
ReadShareRemoteNamespace
{ server = DefaultCodeserver,
repo = "unison",
path = "public" Path.:< "dev" Path.:< "base" Path.:< Path.fromText t
path = "public" Path.:< "base" Path.:< Path.fromText t
}

4
unison-cli/tests/Unison/Test/VersionParser.hs
View File

@ -15,7 +15,7 @@ test =
scope "versionparser" . tests . fmap makeTest $
[ ("release/M1j", "releases._M1j"),
("release/M1j.2", "releases._M1j_2"),
("latest-abc", "trunk"),
("latest-abc", "latest"),
("release/M2i_3", "releases._M2i_3"),
("release/M2i-HOTFIX", "releases._M2i_HOTFIX")
]
@ -29,7 +29,7 @@ makeTest (version, path) =
( ReadShareRemoteNamespace
{ server = DefaultCodeserver,
repo = "unison",
path = Path.fromList ["public", "dev", "base"] <> Path.fromText path
path = Path.fromList ["public", "base"] <> Path.fromText path
}
)
)