Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
walint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
hub
walint
Commits
ea6ef983
Commit
ea6ef983
authored
3 years ago
by
stuebinm
Browse files
Options
Downloads
Patches
Plain Diff
add special warning for rc3 old-style links
(the format used last year is no longer applicable to this year's event)
parent
b8e3d6ee
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/Paths.hs
+8
-0
8 additions, 0 deletions
lib/Paths.hs
lib/Properties.hs
+5
-2
5 additions, 2 deletions
lib/Properties.hs
with
13 additions
and
2 deletions
lib/Paths.hs
+
8
−
0
View file @
ea6ef983
...
@@ -60,3 +60,11 @@ normalise prefix (Path i path _) =
...
@@ -60,3 +60,11 @@ normalise prefix (Path i path _) =
normaliseWithFrag
::
FilePath
->
RelPath
->
FilePath
normaliseWithFrag
::
FilePath
->
RelPath
->
FilePath
normaliseWithFrag
prefix
(
Path
i
path
frag
)
=
normaliseWithFrag
prefix
(
Path
i
path
frag
)
=
normalise
prefix
(
Path
(
i
+
1
)
path
frag
)
<>
T
.
unpack
(
maybe
mempty
(
"#"
<>
)
frag
)
normalise
prefix
(
Path
(
i
+
1
)
path
frag
)
<>
T
.
unpack
(
maybe
mempty
(
"#"
<>
)
frag
)
-- | does this path contain an old-style pattern for inter-repository
-- links as was used at rc3 in 2020?
isOldStyle
::
RelPath
->
Bool
isOldStyle
(
Path
_
text
frag
)
=
path
=~
(
"{<.+>*}"
::
Text
)
where
path
=
case
frag
of
Just
f
->
text
<>
f
_
->
text
This diff is collapsed.
Click to expand it.
lib/Properties.hs
+
5
−
2
View file @
ea6ef983
...
@@ -35,7 +35,7 @@ import LintConfig (LintConfig (..))
...
@@ -35,7 +35,7 @@ import LintConfig (LintConfig (..))
import
LintWriter
(
LintWriter
,
adjust
,
askContext
,
askFileDepth
,
import
LintWriter
(
LintWriter
,
adjust
,
askContext
,
askFileDepth
,
complain
,
dependsOn
,
forbid
,
lintConfig
,
complain
,
dependsOn
,
forbid
,
lintConfig
,
offersBadge
,
offersEntrypoint
,
suggest
,
warn
)
offersBadge
,
offersEntrypoint
,
suggest
,
warn
)
import
Paths
(
PathResult
(
..
),
RelPath
(
..
),
parsePath
)
import
Paths
(
PathResult
(
..
),
RelPath
(
..
),
parsePath
,
isOldStyle
)
import
Types
(
Dep
(
Link
,
Local
,
LocalMap
,
MapLink
))
import
Types
(
Dep
(
Link
,
Local
,
LocalMap
,
MapLink
))
import
Uris
(
SubstError
(
..
),
applySubst
)
import
Uris
(
SubstError
(
..
),
applySubst
)
...
@@ -323,7 +323,10 @@ checkTileLayerProperty p@(Property name _value) = case name of
...
@@ -323,7 +323,10 @@ checkTileLayerProperty p@(Property name _value) = case name of
forbidEmptyLayer
forbidEmptyLayer
unwrapURI
(
Proxy
@
"map"
)
p
unwrapURI
(
Proxy
@
"map"
)
p
(
dependsOn
.
MapLink
)
(
dependsOn
.
MapLink
)
(
dependsOn
.
LocalMap
)
(
\
path
->
do
if
isOldStyle
path
then
complain
"Old-Style inter-repository links (using {<placeholder>}) cannot be used at rC3 2021; please use world:// instead (cf. howto.rc3.world)."
else
dependsOn
.
LocalMap
$
path
)
"exitSceneUrl"
->
"exitSceneUrl"
->
deprecatedUseInstead
"exitUrl"
deprecatedUseInstead
"exitUrl"
"exitInstance"
->
"exitInstance"
->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment