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 #70 from Cyberboss/lessannoyance

Browse Source 
Adds reset message, removes already up to date message, fixes reset logging
This commit is contained in:
Jordan Brown
2017-06-23 11:10:29 -04:00
committed by GitHub
parent 33a2d6c812 ff0d01766a
commit 6f4bd855ac
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/Repository.cs
+5 -3
View File
@@ -336,7 +336,6 @@ namespace TGServerService
SendMessage("REPO: Merge conflicted, aborted.");
return "Merge conflict occurred.";
case MergeStatus.UpToDate:
SendMessage("REPO: Merge already up to date!");
return RepoErrorUpToDate;
}
return null;
@@ -455,10 +454,13 @@ namespace TGServerService
lock (RepoLock)
{
var res = LoadRepo() ?? ResetNoLock(trackedBranch ? (Repo.Head.TrackedBranch ?? Repo.Head) : Repo.Head);
if (trackedBranch && res == null)
if (res == null)
{
DeletePRList();
SendMessage(String.Format("REPO: Hard reset to {0}branch", trackedBranch ? "tracked " : ""));
if (trackedBranch)
DeletePRList();
TGServerService.WriteInfo(String.Format("Repo branch reset{0}", trackedBranch ? " to tracked branch" : ""), trackedBranch ? TGServerService.EventID.RepoResetTracked : TGServerService.EventID.RepoReset);
return null;
}
TGServerService.WriteWarning(String.Format("Failed to reset{0}: {1}", trackedBranch ? " to tracked branch" : "", res), trackedBranch ? TGServerService.EventID.RepoResetTrackedFail : TGServerService.EventID.RepoResetFail);
return res;