mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-28 18:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Atlas: some final cleanups (#21947)

Browse Source
This commit is contained in:
Andreas Rumpf
2023-05-28 18:18:30 +02:00
committed by GitHub
parent 5997324709
commit 7ebb042f79
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/atlas/atlas.nim
View File

@@ -106,7 +106,7 @@ type
keepCommits: bool
cfgHere: bool
p: Table[string, string] # name -> url mapping
errors: int
errors, warnings: int
lockOption: LockOption
lockFileToWrite: seq[LockFileEntry]
lockFileToUse: Table[string, LockFileEntry]
@@ -224,7 +224,7 @@ proc warn(c: var AtlasContext; p: PackageName; arg: string) =
message(c, "[Warning] ", p, arg)
else:
stdout.styledWriteLine(fgYellow, styleBright, "[Warning] ", resetStyle, fgCyan, "(", p.string, ")", resetStyle, " ", arg)
inc c.errors
inc c.warnings
proc error(c: var AtlasContext; p: PackageName; arg: string) =
if c.noColors:
@@ -239,6 +239,8 @@ proc info(c: var AtlasContext; p: PackageName; arg: string) =
else:
stdout.styledWriteLine(fgGreen, styleBright, "[Info] ", resetStyle, fgCyan, "(", p.string, ")", resetStyle, " ", arg)
template projectFromCurrentDir(): PackageName = PackageName(getCurrentDir().splitPath.tail)
proc sameVersionAs(tag, ver: string): bool =
const VersionChars = {'0'..'9', '.'}
@@ -317,14 +319,16 @@ proc pushTag(c: var AtlasContext; tag: string) =
else:
info(c, c.projectDir.PackageName, "successfully pushed tag: " & tag)
proc incrementTag(lastTag: string; field: Natural): string =
proc incrementTag(c: var AtlasContext; lastTag: string; field: Natural): string =
var startPos =
if lastTag[0] in {'0'..'9'}: 0
else: 1
var endPos = lastTag.find('.', startPos)
if field >= 1:
for i in 1 .. field:
assert endPos != -1, "the last tag '" & lastTag & "' is missing . periods"
if endPos == -1:
error c, projectFromCurrentDir(), "the last tag '" & lastTag & "' is missing . periods"
return ""
startPos = endPos + 1
endPos = lastTag.find('.', startPos)
if endPos == -1:
@@ -344,7 +348,7 @@ proc incrementLastTag(c: var AtlasContext; field: Natural): string =
info c, c.projectDir.PackageName, "the current commit '" & currentCommit & "' is already tagged '" & lastTag & "'"
lastTag
else:
incrementTag(lastTag, field)
incrementTag(c, lastTag, field)
else: "v0.0.1" # assuming no tags have been made yet
proc tag(c: var AtlasContext; tag: string) =
@@ -602,8 +606,6 @@ const
configPatternBegin = "############# begin Atlas config section ##########\n"
configPatternEnd = "############# end Atlas config section ##########\n"
template projectFromCurrentDir(): PackageName = PackageName(getCurrentDir().splitPath.tail)
proc patchNimCfg(c: var AtlasContext; deps: seq[CfgPath]; cfgPath: string) =
var paths = "--noNimblePath\n"
for d in deps:
@@ -936,6 +938,9 @@ proc main =
elif args[0].len == 1 and args[0][0] in {'a'..'z'}:
let field = ord(args[0][0]) - ord('a')
tag(c, field)
elif args[0].len == 1 and args[0][0] in {'A'..'Z'}:
let field = ord(args[0][0]) - ord('A')
tag(c, field)
elif '.' in args[0]:
tag(c, args[0])
else: