Clean up some repository stuff

src/Tgstation.Server.Api/Models/Internal/RepositorySettings.cs

@@ -48,5 +48,19 @@ namespace Tgstation.Server.Api.Models.Internal
 		[Permissions(WriteRight = RepositoryRights.ChangeTestMergeCommits)]
 		[Required]
 		public bool? ShowTestMergeCommitters { get; set; }
+
+		/// <summary>
+		/// If test merge commits should be kept when auto updating. May cause merge conflicts which will block the update
+		/// </summary>
+		[Permissions(WriteRight = RepositoryRights.ChangeTestMergeCommits)]
+		[Required]
+		public bool? AutoUpdatesKeepTestMerges { get; set; }
+
+		/// <summary>
+		/// If synchronization should occur when auto updating
+		/// </summary>
+		[Permissions(WriteRight = RepositoryRights.ChangeTestMergeCommits)]
+		[Required]
+		public bool? AutoUpdatesSynchronize { get; set; }
 	}
 }

src/Tgstation.Server.Api/Rights/RepositoryRights.cs

@@ -48,5 +48,9 @@ namespace Tgstation.Server.Api.Rights
 		/// User may read all fields in the <see cref="Models.Repository"/> with the exception of <see cref="Models.Internal.RepositorySettings.AccessToken"/>
 		/// </summary>
 		Read = 512,
+		/// <summary>
+		/// User may change <see cref="Models.Internal.RepositorySettings.AutoUpdatesKeepTestMerges"/> and  <see cref="Models.Internal.RepositorySettings.AutoUpdatesSynchronize"/>
+		/// </summary>
+		ChangeAutoUpdateSettings = 1024
 	}
 }

src/Tgstation.Server.Host/Components/EventType.cs

@@ -10,7 +10,7 @@
 		/// </summary>
 		RepoResetOrigin = 0,
 		/// <summary>
-		/// Parameters: Reference name, commit sha
+		/// Parameters: Checkout target
 		/// </summary>
 		RepoCheckout = 1,
 		/// <summary>
@@ -18,18 +18,18 @@
 		/// </summary>
 		RepoFetch = 2,
 		/// <summary>
-		/// Parameters: Comma separated list in form of "#{Pull Request Number} @ {7 character SHA}
+		/// Parameters: Pull request number, pull request sha, merger name, merger message
 		/// </summary>
-		RepoMergePullRequests = 3,
+		RepoMergePullRequest = 3,
+		/// <summary>
+		/// Parameters: Absolute path to repository root, committer name, committer email
+		/// </summary>
+		RepoPreSynchronize = 4,
 
 		/// <summary>
 		/// Parameters: Current version, new version
 		/// </summary>
-		ByondChangeStart = 4,
-		/// <summary>
-		/// No parameters
-		/// </summary>
-		ByondChangeCancelled = 5,
+		ByondChangeStart = 5,
 		/// <summary>
 		/// Parameters: Error string
 		/// </summary>
@@ -37,36 +37,42 @@
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		ByondStageComplete = 7,
-		/// <summary>
-		/// No parameters
-		/// </summary>
-		ByondChangeComplete = 8,
+		ByondChangeComplete = 7,
 
 		/// <summary>
 		/// Parameters: Origin commit sha
 		/// </summary>
-		CompileStart = 9,
+		CompileStart = 8,
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		CompileCancelled = 10,
+		CompileCancelled = 9,
 		/// <summary>
 		/// Parameters: "1" if compile succeeded and api validation failed, "0" otherwise
 		/// </summary>
-		CompileFailure = 11,
+		CompileFailure = 10,
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		CompileComplete = 12,
+		CompileComplete = 11,
 		
 		/// <summary>
 		/// Parameters: Exit code
 		/// </summary>
-		DDOtherCrash = 13,
+		DDOtherCrash = 12,
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		DDOtherExit = 14,
+		DDOtherExit = 13,
+
+		/// <summary>
+		/// No parameters
+		/// </summary>
+		InstanceAutoUpdateStart = 14,
+
+		/// <summary>
+		/// Parameters: Base sha, target sha, base reference, target reference
+		/// </summary>
+		RepoMergeConflict = 15,
 	}
 }

src/Tgstation.Server.Host/Components/Repository/IRepository.cs

@@ -44,11 +44,11 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// <param name="targetCommit">The commit in the pull request to merge</param>
 		/// <param name="committerName">The name of the merge committer</param>
 		/// <param name="committerEmail">The e-mail of the merge committer</param>
-		/// <param name="commitBody">The body of the commit message</param>
 		/// <param name="accessString">The access string to fetch from the origin repository</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
+		/// <param name="mergerIdentifier">A string to identify the user that merged</param>
 		/// <returns>A <see cref="Task{TResult}"/> resulting in the SHA of the new HEAD on success, <see langword="null"/> on merge conflict</returns>
-		Task<string> AddTestMerge(int pullRequestNumber, string targetCommit, string committerName, string committerEmail, string commitBody, string accessString, CancellationToken cancellationToken);
+		Task<string> AddTestMerge(int pullRequestNumber, string targetCommit, string committerName, string committerEmail, string accessString, string mergerIdentifier, CancellationToken cancellationToken);
 
 		/// <summary>
 		/// Fetch commits from the origin repository
@@ -68,9 +68,11 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// <summary>
 		/// Requires the current HEAD to be a tracked reference. Merges the reference to what it tracks on the origin repository
 		/// </summary>
+		/// <param name="committerName">The name of the merge committer</param>
+		/// <param name="committerEmail">The e-mail of the merge committer</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
 		/// <returns>A <see cref="Task{TResult}"/> resulting in the SHA of the new HEAD. <see langword="null"/> if the merge resulted in conflict</returns>
-		Task<string> MergeOrigin(CancellationToken cancellationToken);
+		Task<string> MergeOrigin(string committerName, string committerEmail, CancellationToken cancellationToken);
 
 		/// <summary>
 		/// Force push the current repository HEAD to <see cref="Repository.RemoteTemporaryBranchName"/>;

src/Tgstation.Server.Host/Components/Repository/Repository.cs

@@ -12,6 +12,8 @@ namespace Tgstation.Server.Host.Components.Repository
 	/// <inheritdoc />
 	sealed class Repository : IRepository
 	{
+		const string UnknownReference = "<UNKNOWN>";
+
 		/// <summary>
 		/// The branch name used for publishing testmerge commits
 		/// </summary>
@@ -39,6 +41,11 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// </summary>
 		readonly IIOManager ioMananger;
 
+		/// <summary>
+		/// The <see cref="IEventConsumer"/> for the <see cref="Repository"/>
+		/// </summary>
+		readonly IEventConsumer eventConsumer;
+
 		/// <summary>
 		/// <see cref="Action"/> to be taken when <see cref="Dispose"/> is called
 		/// </summary>
@@ -49,11 +56,13 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// </summary>
 		/// <param name="repository">The value of <see cref="repository"/></param>
 		/// <param name="ioMananger">The value of <see cref="ioMananger"/></param>
+		/// <param name="eventConsumer">The value of <see cref="eventConsumer"/></param>
 		/// <param name="onDispose">The value if <see cref="onDispose"/></param>
-		public Repository(LibGit2Sharp.IRepository repository, IIOManager ioMananger, Action onDispose)
+		public Repository(LibGit2Sharp.IRepository repository, IIOManager ioMananger, IEventConsumer eventConsumer, Action onDispose)
 		{
 			this.repository = repository ?? throw new ArgumentNullException(nameof(repository));
 			this.ioMananger = ioMananger ?? throw new ArgumentNullException(nameof(ioMananger));
+			this.eventConsumer = eventConsumer ?? throw new ArgumentNullException(nameof(eventConsumer));
 			this.onDispose = onDispose ?? throw new ArgumentNullException(nameof(onDispose));
 			IsGitHubRepository = Origin.ToUpperInvariant().Contains("://GITHUB.COM/");
 		}
@@ -97,79 +106,104 @@ namespace Tgstation.Server.Host.Components.Repository
 		}
 
 		/// <inheritdoc />
-		public Task<string> AddTestMerge(int pullRequestNumber, string targetCommit, string committerName, string committerEmail, string commitBody, string accessString, CancellationToken cancellationToken) => Task.Factory.StartNew(() =>
+		public async Task<string> AddTestMerge(int pullRequestNumber, string targetCommit, string committerName, string committerEmail, string accessString, string mergerIdentifier, CancellationToken cancellationToken)
 		{
+
+			if (!IsGitHubRepository)
+				throw new InvalidOperationException("Test merging is only available on GitHub hosted origin repositories!");
+
 			var Refspec = new List<string>();
 			var prBranchName = String.Format(CultureInfo.InvariantCulture, "pr-{0}", pullRequestNumber);
 			var localBranchName = String.Format(CultureInfo.InvariantCulture, "pull/{0}/headrefs/heads/{1}", pullRequestNumber, prBranchName);
 			Refspec.Add(String.Format(CultureInfo.InvariantCulture, "pull/{0}/head:{1}", pullRequestNumber, prBranchName));
 			var logMessage = String.Format(CultureInfo.InvariantCulture, "Merge remote pull request #{0}", pullRequestNumber);
 
-			var remote = repository.Network.Remotes.Add("temp_pr_fetch", GenerateAuthUrl(Origin, accessString));
-			try
-			{
-				cancellationToken.ThrowIfCancellationRequested();
-				Commands.Fetch((LibGit2Sharp.Repository)repository, remote.Name, Refspec, new FetchOptions
-				{
-					Prune = true,
-					OnProgress = (a) => !cancellationToken.IsCancellationRequested,
-					OnTransferProgress = (a) => !cancellationToken.IsCancellationRequested,
-					OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested
-				}, logMessage);
-			}
-			catch (UserCancelledException) { }
-			finally
-			{
-				repository.Network.Remotes.Remove(remote.Name);
-				//commit is there and we never gc so
-				repository.Branches.Remove(localBranchName);
-				repository.Branches.Remove(prBranchName);
-			}
-
-			cancellationToken.ThrowIfCancellationRequested();
-
 			var originalCommit = repository.Head;
 
-			var result = repository.Merge(targetCommit, new Signature(new Identity(committerName, committerEmail), DateTimeOffset.Now), new MergeOptions
+			MergeResult result = null;
+			await Task.Factory.StartNew(() =>
 			{
-				CommitOnSuccess = true,
-				FailOnConflict = true,
-				FastForwardStrategy = FastForwardStrategy.NoFastForward,
-				SkipReuc = true,
-			});
+				var remote = repository.Network.Remotes.Add("temp_pr_fetch", GenerateAuthUrl(Origin, accessString));
+				try
+				{
+					cancellationToken.ThrowIfCancellationRequested();
+					Commands.Fetch((LibGit2Sharp.Repository)repository, remote.Name, Refspec, new FetchOptions
+					{
+						Prune = true,
+						OnProgress = (a) => !cancellationToken.IsCancellationRequested,
+						OnTransferProgress = (a) => !cancellationToken.IsCancellationRequested,
+						OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested
+					}, logMessage);
+				}
+				catch (UserCancelledException) { }
+				finally
+				{
+					repository.Network.Remotes.Remove(remote.Name);
+					//commit is there and we never gc so
+					repository.Branches.Remove(localBranchName);
+					repository.Branches.Remove(prBranchName);
+				}
 
-			if (result.Status != MergeStatus.NonFastForward)
+				cancellationToken.ThrowIfCancellationRequested();
+
+				result = repository.Merge(targetCommit, new Signature(new Identity(committerName, committerEmail), DateTimeOffset.Now), new MergeOptions
+				{
+					CommitOnSuccess = true,
+					FailOnConflict = true,
+					FastForwardStrategy = FastForwardStrategy.NoFastForward,
+					SkipReuc = true
+				});
+
+				cancellationToken.ThrowIfCancellationRequested();
+
+				if (result.Status == MergeStatus.Conflicts)
+				{
+					RawCheckout(originalCommit.CanonicalName ?? originalCommit.Tip.Sha);
+					cancellationToken.ThrowIfCancellationRequested();
+				}
+
+				repository.RemoveUntrackedFiles();
+			}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current).ConfigureAwait(false);
+
+			if (result.Status == MergeStatus.Conflicts)
 			{
-				RawCheckout(originalCommit.FriendlyName ?? originalCommit.Tip.Sha);
+				await eventConsumer.HandleEvent(EventType.RepoMergeConflict, new List<string> { originalCommit.Tip.Sha, targetCommit, originalCommit.FriendlyName ?? UnknownReference, prBranchName }, cancellationToken).ConfigureAwait(false);
 				return null;
 			}
 
 			return result.Commit.Sha;
-
-		}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
+		}
 
 		/// <inheritdoc />
-		public Task CheckoutObject(string committish, CancellationToken cancellationToken) => Task.Factory.StartNew(() => RawCheckout(committish), cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
-
-		/// <inheritdoc />
-		public Task FetchOrigin(string accessString, CancellationToken cancellationToken) => Task.Factory.StartNew(() =>
+		public async Task CheckoutObject(string committish, CancellationToken cancellationToken)
 		{
-			var remote = repository.Network.Remotes.First();
-			try
+			if (committish == null)
+				throw new ArgumentNullException(nameof(committish));
+			await eventConsumer.HandleEvent(EventType.RepoCheckout, new List<string> { committish }, cancellationToken).ConfigureAwait(false);
+			await Task.Factory.StartNew(() => RawCheckout(committish), cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current).ConfigureAwait(false);
+		}
+
+		/// <inheritdoc />
+		public Task FetchOrigin(string accessString, CancellationToken cancellationToken) => Task.WhenAll(
+			eventConsumer.HandleEvent(EventType.RepoFetch, Array.Empty<string>(), cancellationToken),
+			Task.Factory.StartNew(() =>
 			{
-				Commands.Fetch((LibGit2Sharp.Repository)repository, remote.Name, remote.FetchRefSpecs.Select(x => x.Specification), new FetchOptions
+				var remote = repository.Network.Remotes.First();
+				try
 				{
-					Prune = true,
-					OnProgress = (a) => !cancellationToken.IsCancellationRequested,
-					OnTransferProgress = (a) => !cancellationToken.IsCancellationRequested,
-					OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested
-				}, "Fetch origin commits");
-			}
-			catch (UserCancelledException)
-			{
-				cancellationToken.ThrowIfCancellationRequested();
-			}
-		}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
+					Commands.Fetch((LibGit2Sharp.Repository)repository, remote.Name, remote.FetchRefSpecs.Select(x => x.Specification), new FetchOptions
+					{
+						Prune = true,
+						OnProgress = (a) => !cancellationToken.IsCancellationRequested,
+						OnTransferProgress = (a) => !cancellationToken.IsCancellationRequested,
+						OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested
+					}, "Fetch origin commits");
+				}
+				catch (UserCancelledException)
+				{
+					cancellationToken.ThrowIfCancellationRequested();
+				}
+			}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current));
 
 		/// <inheritdoc />
 		public Task PushHeadToTemporaryBranch(string accessString, CancellationToken cancellationToken) => Task.Factory.StartNew(() =>
@@ -205,22 +239,26 @@ namespace Tgstation.Server.Host.Components.Repository
 			{
 				repository.Branches.Remove(branch);
 			}
-
 		}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
 
 		/// <inheritdoc />
-		public Task<string> ResetToOrigin(CancellationToken cancellationToken) => Task.Factory.StartNew(() =>
+		public async Task<string> ResetToOrigin(CancellationToken cancellationToken)
 		{
 			if (!repository.Head.IsTracking)
 				throw new InvalidOperationException("Cannot reset to origin while not on a tracked reference!");
 			var trackedBranch = repository.Head.TrackedBranch;
-			Commands.Checkout((LibGit2Sharp.Repository)repository, repository.Head.TrackedBranch, new CheckoutOptions
+			await eventConsumer.HandleEvent(EventType.RepoResetOrigin, new List<string> { trackedBranch.FriendlyName, trackedBranch.Tip.Sha }, cancellationToken).ConfigureAwait(false);
+			return await Task.Factory.StartNew(() =>
 			{
-				CheckoutModifiers = CheckoutModifiers.Force
-			});
-			repository.RemoveUntrackedFiles();
-			return trackedBranch.Tip.Sha;
-		}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
+				Commands.Checkout((LibGit2Sharp.Repository)repository, repository.Head.TrackedBranch, new CheckoutOptions
+				{
+					CheckoutModifiers = CheckoutModifiers.Force
+				});
+				cancellationToken.ThrowIfCancellationRequested();
+				repository.RemoveUntrackedFiles();
+				return trackedBranch.Tip.Sha;
+			}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current).ConfigureAwait(false);
+		}
 
 		/// <inheritdoc />
 		public async Task CopyTo(string path, CancellationToken cancellationToken)
@@ -231,15 +269,84 @@ namespace Tgstation.Server.Host.Components.Repository
 		}
 
 		/// <inheritdoc />
-		public Task<string> MergeOrigin(CancellationToken cancellationToken)
+		public async Task<string> MergeOrigin(string committerName, string committerEmail, CancellationToken cancellationToken)
 		{
-			throw new NotImplementedException();
+			MergeResult result = null;
+			Branch trackedBranch = null;
+
+			var oldHead = repository.Head;
+
+			await Task.Factory.StartNew(() =>
+			{
+				if (!repository.Head.IsTracking)
+					throw new InvalidOperationException("Cannot reset to origin while not on a tracked reference!");
+				trackedBranch = repository.Head.TrackedBranch;
+
+				result = repository.Merge(trackedBranch, new Signature(new Identity(committerName, committerEmail), DateTimeOffset.Now), new MergeOptions
+				{
+					CommitOnSuccess = true,
+					FailOnConflict = true,
+					FastForwardStrategy = FastForwardStrategy.Default,
+					SkipReuc = true,
+				});
+
+				cancellationToken.ThrowIfCancellationRequested();
+
+				if (result.Status == MergeStatus.Conflicts)
+				{
+					RawCheckout(oldHead.CanonicalName);
+					cancellationToken.ThrowIfCancellationRequested();
+				}
+
+				repository.RemoveUntrackedFiles();
+			}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current).ConfigureAwait(false);
+
+			if (result.Status == MergeStatus.Conflicts)
+			{
+				await eventConsumer.HandleEvent(EventType.RepoMergeConflict, new List<string> { oldHead.Tip.Sha, trackedBranch.Tip.Sha, oldHead.FriendlyName ?? UnknownReference, trackedBranch.FriendlyName }, cancellationToken).ConfigureAwait(false);
+				return null;
+			}
+
+			return Head;
 		}
 
 		/// <inheritdoc />
-		public Task Sychronize(string accessString, CancellationToken cancellationToken)
+		public async Task Sychronize(string accessString, CancellationToken cancellationToken)
 		{
-			throw new NotImplementedException();
+			var startHead = Head;
+
+			if (!await eventConsumer.HandleEvent(EventType.RepoPreSynchronize, new List<string> { ioMananger.ResolvePath(".") }, cancellationToken).ConfigureAwait(false))
+				return;
+
+			if (Head == startHead || !repository.Head.IsTracking)
+				return;
+
+			await Task.Factory.StartNew(() =>
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				var remote = repository.Network.Remotes.Add("temp_push", GenerateAuthUrl(Origin, accessString));
+				try
+				{
+					cancellationToken.ThrowIfCancellationRequested();
+					try
+					{
+						repository.Network.Push(repository.Head, new PushOptions
+						{
+							OnPackBuilderProgress = (a, b, c) => !cancellationToken.IsCancellationRequested,
+							OnNegotiationCompletedBeforePush = (a) => !cancellationToken.IsCancellationRequested,
+							OnPushTransferProgress = (a, b, c) => !cancellationToken.IsCancellationRequested
+						});
+					}
+					catch (UserCancelledException)
+					{
+						cancellationToken.ThrowIfCancellationRequested();
+					}
+				}
+				finally
+				{
+					repository.Network.Remotes.Remove(remote.Name);
+				}
+			}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current).ConfigureAwait(false);
 		}
 	}
 }