cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 21:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from Cyberboss/asdfasdf

Browse Source 
Removes ITGServerUpdater. Locks changelog pushing to when local HEAD matches remote
This commit is contained in:
Jordan Brown
2017-08-16 14:12:11 -04:00
committed by GitHub
parent ca920e4674 ac80fd8dc4
commit d4a1ec5602
6 changed files with 129 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGCommandLine/RootCommands.cs
+44 -9
View File
@@ -27,22 +27,44 @@ namespace TGCommandLine
protected override ExitCode Run(IList<string> parameters)
{
var gen_cl = parameters.Count > 1 && parameters[1].ToLower() == "--cl";
TGRepoUpdateMethod method;
var Repo = Server.GetComponent<ITGRepository>();
switch (parameters[0].ToLower())
{
case "hard":
method = TGRepoUpdateMethod.Hard;
var res = Repo.Update(true);
if (res != null)
{
OutputProc(res);
return ExitCode.ServerError;
}
break;
case "merge":
method = TGRepoUpdateMethod.Merge;
res = Repo.Update(false);
if (res != null)
{
OutputProc(res);
return ExitCode.ServerError;
}
break;
default:
OutputProc("Please specify hard or merge");
return ExitCode.BadCommand;
}
var result = Server.GetComponent<ITGServerUpdater>().UpdateServer(method, gen_cl);
OutputProc(result ?? "Compilation started!");
return result == null ? ExitCode.Normal : ExitCode.ServerError;
if (gen_cl)
{
var res = Repo.GenerateChangelog(out string error2);
if (res != null)
OutputProc(res);
else
{
res = Repo.PushChangelog();
if (res != null)
OutputProc(res);
}
}
var resu = Server.GetComponent<ITGCompiler>().Compile(true);
OutputProc(resu ? "Compilation started!" : "Compilation could not be started!");
return resu ? ExitCode.Normal : ExitCode.ServerError;
}
public override string GetArgumentString()
@@ -77,9 +99,22 @@ namespace TGCommandLine
OutputProc("Invalid tesmerge #: " + parameters[0]);
return ExitCode.BadCommand;
}
var result = Server.GetComponent<ITGServerUpdater>().UpdateServer(TGRepoUpdateMethod.None, false, tm);
OutputProc(result ?? "Compilation started!");
return result == null ? ExitCode.Normal : ExitCode.ServerError;
var Repo = Server.GetComponent<ITGRepository>();
var res = Repo.MergePullRequest(tm);
if (res != null)
{
OutputProc(res);
return ExitCode.ServerError;
}
res = Repo.GenerateChangelog(out string error2);
if (res != null)
{
OutputProc(res);
return ExitCode.ServerError;
}
var resu = Server.GetComponent<ITGCompiler>().Compile(true);
OutputProc(resu ? "Compilation started!" : "Compilation could not be started!");
return resu ? ExitCode.Normal : ExitCode.ServerError;
}
public override string GetArgumentString()
{
TGControlPanel/ServerPage.cs
+52 -10
View File
@@ -17,7 +17,7 @@ namespace TGControlPanel
}
FullUpdateAction fuAction;
int testmergePR;
ushort testmergePR;
string updateError;
bool updatingFields = false;
@@ -246,7 +246,7 @@ namespace TGControlPanel
Server.GetComponent<ITGDreamDaemon>().SetPort((ushort)PortSelector.Value);
}
private void RunServerUpdate(FullUpdateAction fua, int tm = 0)
private void RunServerUpdate(FullUpdateAction fua, ushort tm = 0)
{
if (FullUpdateWorker.IsBusy)
return;
@@ -373,25 +373,67 @@ namespace TGControlPanel
return;
Server.GetComponent<ITGDreamDaemon>().RequestRestart();
}
private void FullUpdateWorker_DoWork(object sender, DoWorkEventArgs e)
{
var Updater = Server.GetComponent<ITGServerUpdater>();
var Repo = Server.GetComponent<ITGRepository>();
var DM = Server.GetComponent<ITGCompiler>();
switch (fuAction)
{
case FullUpdateAction.Testmerge:
updateError = Updater.UpdateServer(TGRepoUpdateMethod.None, false, (ushort)testmergePR);
updateError = Repo.MergePullRequest(testmergePR);
if (updateError == null)
{
updateError = Repo.GenerateChangelog(out string error2);
updateError = DM.Compile(true) ? updateError : "Compilation failed!";
}
break;
case FullUpdateAction.UpdateHard:
updateError = Updater.UpdateServer(TGRepoUpdateMethod.Hard, true);
updateError = Repo.Update(true);
if (updateError == null)
{
updateError = Repo.GenerateChangelog(out string error2) ?? Repo.PushChangelog();
error2 = DM.Compile(true) ? null : "Compilation failed!";
if(error2 != null)
updateError = error2;
}
break;
case FullUpdateAction.UpdateHardTestmerge:
updateError = Updater.UpdateServer(TGRepoUpdateMethod.Hard, true, (ushort)testmergePR);
updateError = Repo.Update(true);
if (updateError == null)
{
updateError = Repo.GenerateChangelog(out string error2) ?? Repo.PushChangelog();
error2 = Repo.MergePullRequest(testmergePR);
if (error2 == null)
{
error2 = Repo.GenerateChangelog(out error2);
error2 = DM.Compile(true) ? error2 : "Compilation failed!";
}
updateError = error2 ?? updateError;
}
break;
case FullUpdateAction.UpdateMerge:
updateError = Updater.UpdateServer(TGRepoUpdateMethod.Merge, true, (ushort)testmergePR);
updateError = Repo.Update(false);
if (updateError == null)
{
updateError = Repo.GenerateChangelog(out string error2);
if(updateError == null)
Repo.PushChangelog(); //not an error 99% of the time if this fails, just a dirty tree
error2 = DM.Compile(true) ? null : "Compilation failed!";
if (error2 != null)
updateError = error2;
}
break;
case FullUpdateAction.Reset:
updateError = Updater.UpdateServer(TGRepoUpdateMethod.Reset, false, 0);
updateError = Repo.Reset(true);
if (updateError == null)
{
updateError = Repo.GenerateChangelog(out string error2);
error2 = DM.Compile(true) ? null : "Compilation failed!";
if (error2 != null)
updateError = error2;
}
break;
}
}
@@ -407,7 +449,7 @@ namespace TGControlPanel
private void UpdateTestmergeButton_Click(object sender, System.EventArgs e)
{
RunServerUpdate(FullUpdateAction.UpdateHardTestmerge, (int)ServerTestmergeInput.Value);
RunServerUpdate(FullUpdateAction.UpdateHardTestmerge, (ushort)ServerTestmergeInput.Value);
}
private void UpdateMergeButton_Click(object sender, System.EventArgs e)
@@ -416,7 +458,7 @@ namespace TGControlPanel
}
private void TestmergeButton_Click(object sender, System.EventArgs e)
{
RunServerUpdate(FullUpdateAction.Testmerge, (int)ServerTestmergeInput.Value);
RunServerUpdate(FullUpdateAction.Testmerge, (ushort)ServerTestmergeInput.Value);
}
private void NudgePortSelector_ValueChanged(object sender, EventArgs e)
TGServerService/InterfaceBase.cs
+2 -49
View File
@@ -9,7 +9,7 @@ namespace TGServerService
//this line basically says make one instance of the service, use it multithreaded for requests, and never delete it
[ServiceBehavior(ConcurrencyMode = ConcurrencyMode.Multiple, InstanceContextMode = InstanceContextMode.Single)]
partial class TGStationServer : IDisposable, ITGSService, ITGServerUpdater
partial class TGStationServer : IDisposable, ITGSService
{
//call partial constructors/destructors from here
@@ -32,59 +32,12 @@ namespace TGServerService
DisposeChat();
}
//public api
public string Version()
{
return TGServerService.Version;
}
//one stop update
public string UpdateServer(TGRepoUpdateMethod updateType, bool push_changelog_if_enabled, ushort testmerge_pr)
{
try
{
string res;
switch (updateType)
{
case TGRepoUpdateMethod.Hard:
case TGRepoUpdateMethod.Merge:
res = Update(updateType == TGRepoUpdateMethod.Hard);
if (res != null && res != RepoErrorUpToDate)
return res;
break;
case TGRepoUpdateMethod.Reset:
res = Reset(true);
if (res != null)
return res;
break;
case TGRepoUpdateMethod.None:
break;
}
if (testmerge_pr != 0)
{
res = MergePullRequestImpl(testmerge_pr, true);
if (res != null && res != RepoErrorUpToDate)
return res;
}
GenerateChangelog(out res);
if (res == null && push_changelog_if_enabled && SSHAuth())
{
res = Commit();
if (res == null)
res = Push();
}
if (!Compile(true))
return "Compilation could not be started!";
return res;
}
catch (Exception e)
{
return e.ToString();
}
}
//public api
public void VerifyConnection() { }
TGServerService/Repository.cs
+24 -1
View File
@@ -671,7 +671,30 @@ namespace TGServerService
}
}
//public api
public string PushChangelog()
{
return LocalIsRemote() ? Commit() ?? Push() : "Can't push changelog: HEAD does not match tracked remote branch";
}
bool LocalIsRemote()
{
lock (RepoLock)
{
if (LoadRepo() != null)
return false;
var R = Repo.Network.Remotes["origin"];
try
{
Commands.Fetch(Repo, R.Name, R.FetchRefSpecs.Select(X => X.Specification), null, null);
return Repo.Head.IsTracking && Repo.Head.TrackedBranch.Tip.Sha == Repo.Head.Tip.Sha;
}
catch
{
return false;
}
}
}
string Commit()
{
lock (RepoLock)
TGServiceInterface/Repository.cs
+6
View File
@@ -187,6 +187,12 @@ namespace TGServiceInterface
[OperationContract]
string GenerateChangelog(out string error);
/// <summary>
/// Pushes the changelog to the currently git, this operation will only run if the changelog is the only difference to be pushed (i.e. no PRs merged)
/// </summary>
/// <returns>null on success, error on failure</returns>
string PushChangelog();
/// <summary>
/// Sets the path to the python 2.7 installation
/// </summary>
TGServiceInterface/Server.cs
+1 -42
View File
@@ -8,7 +8,7 @@ namespace TGServiceInterface
/// <summary>
/// List of types that can be used with GetComponen
/// </summary>
public static readonly IList<Type> ValidInterfaces = new List<Type> { typeof(ITGByond), typeof(ITGChat), typeof(ITGCompiler), typeof(ITGConfig), typeof(ITGDreamDaemon), typeof(ITGRepository), typeof(ITGServerUpdater), typeof(ITGSService) };
public static readonly IList<Type> ValidInterfaces = new List<Type> { typeof(ITGByond), typeof(ITGChat), typeof(ITGCompiler), typeof(ITGConfig), typeof(ITGDreamDaemon), typeof(ITGRepository), typeof(ITGSService) };
/// <summary>
/// Base name of the communication pipe
@@ -79,45 +79,4 @@ namespace TGServiceInterface
[OperationContract]
string Version();
}
/// <summary>
/// How to modify the repo during the UpdateServer operation
/// </summary>
public enum TGRepoUpdateMethod
{
/// <summary>
/// Do not update the repo
/// </summary>
None,
/// <summary>
/// Update the repo by merging the origin branch
/// </summary>
Merge,
/// <summary>
/// Update the repo by hard resetting to the remote branch
/// </summary>
Hard,
/// <summary>
/// Clean the repo by hard resetting to the origin branch
/// </summary>
Reset,
}
/// <summary>
/// One stop shop for server updates
/// </summary>
[ServiceContract]
public interface ITGServerUpdater
{
/// <summary>
/// Updates the server fully with various options as a blocking operation
/// </summary>
/// <param name="updateType">How to handle the repository during the update</param>
/// <param name="push_changelog_if_enabled">true if the changelog should be pushed to git</param>
/// <param name="testmerge_pr">If not zero, will testmerge the designated pull request</param>
/// <returns>null on success, error message on failure</returns>
[OperationContract]
string UpdateServer(TGRepoUpdateMethod updateType, bool push_changelog_if_enabled, ushort testmerge_pr = 0);
}
}