shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaces parentcommit with originmastercommit

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-26 14:41:35 -05:00
parent fabe1e98a7
commit 93c19d0e4b
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/getrev.dm
+17 -14
View File
@@ -1,34 +1,37 @@
/datum/getrev /datum/getrev
var/parentcommit var/originmastercommit
var/commit var/commit
var/list/testmerge = list() var/list/testmerge = list()
var/has_pr_details = FALSE //example data in a testmerge entry when this is true: https://api.github.com/repositories/3234987/pulls/22586 var/has_pr_details = FALSE //example data in a testmerge entry when this is true: https://api.github.com/repositories/3234987/pulls/22586
var/date var/date
/datum/getrev/New() /datum/getrev/New()
var/head_file = file2text(".git/logs/HEAD")
if(SERVERTOOLS && fexists("..\\prtestjob.lk")) if(SERVERTOOLS && fexists("..\\prtestjob.lk"))
var/list/tmp = world.file2list("..\\prtestjob.lk") var/list/tmp = world.file2list("..\\prtestjob.lk")
for(var/I in tmp) for(var/I in tmp)
if(I) if(I)
testmerge |= I testmerge |= I
var/testlen = max(testmerge.len - 1, 0)
var/regex/head_log = new("(\\w{40}) .+> (\\d{10}).+(?=(\n.*(\\w{40}).*){[testlen]}\n*\\Z)")
head_log.Find(head_file)
parentcommit = head_log.group[1]
date = unix2date(text2num(head_log.group[2]))
commit = head_log.group[4]
log_world("Running /tg/ revision:") log_world("Running /tg/ revision:")
log_world("[date]") var/list/logs = world.file2list(".git/logs/HEAD")
if(logs)
logs = splittext(logs[logs.len - 1], " ")
date = unix2date(text2num(logs[5]))
commit = logs[2]
log_world("[date]")
logs = world.file2list(".git/logs/refs/remotes/origin/master")
if(logs)
originmastercommit = splittext(logs[logs.len - 1], " ")[2]
if(testmerge.len) if(testmerge.len)
log_world(commit) log_world(commit)
for(var/line in testmerge) for(var/line in testmerge)
if(line) if(line)
log_world("Test merge active of PR #[line]") log_world("Test merge active of PR #[line]")
SSblackbox.add_details("testmerged_prs","[line]") SSblackbox.add_details("testmerged_prs","[line]")
log_world("Based off master commit [parentcommit]") log_world("Based off origin/master commit [originmastercommit]")
else else
log_world(parentcommit) log_world(originmastercommit)
/datum/getrev/proc/DownloadPRDetails() /datum/getrev/proc/DownloadPRDetails()
if(!config.githubrepoid) if(!config.githubrepoid)
@@ -73,13 +76,13 @@
set name = "Show Server Revision" set name = "Show Server Revision"
set desc = "Check the current server code revision" set desc = "Check the current server code revision"
if(GLOB.revdata.parentcommit) if(GLOB.revdata.originmastercommit)
to_chat(src, "<b>Server revision compiled on:</b> [GLOB.revdata.date]") to_chat(src, "<b>Server revision compiled on:</b> [GLOB.revdata.date]")
var/prefix = "" var/prefix = ""
if(GLOB.revdata.testmerge.len) if(GLOB.revdata.testmerge.len)
to_chat(src, GLOB.revdata.GetTestMergeInfo()) to_chat(src, GLOB.revdata.GetTestMergeInfo())
prefix = "Based off master commit: " prefix = "Based off origin/master commit: "
var/pc = GLOB.revdata.parentcommit var/pc = GLOB.revdata.originmastercommit
to_chat(src, "[prefix]<a href='[config.githuburl]/commit/[pc]'>[copytext(pc, 1, min(length(pc), 7))]</a>") to_chat(src, "[prefix]<a href='[config.githuburl]/commit/[pc]'>[copytext(pc, 1, min(length(pc), 7))]</a>")
else else
to_chat(src, "Revision unknown") to_chat(src, "Revision unknown")