Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/GitHub.Api/Git/GitClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface IGitClient

ITask LfsInstall(IOutputProcessor<string> processor = null);

ITask<GitStatus?> Status(IOutputProcessor<GitStatus?> processor = null);
ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null);

ITask<string> GetConfig(string key, GitConfigSource configSource,
IOutputProcessor<string> processor = null);
Expand Down Expand Up @@ -207,7 +207,7 @@ public ITask LfsInstall(IOutputProcessor<string> processor = null)
.Configure(processManager);
}

public ITask<GitStatus?> Status(IOutputProcessor<GitStatus?> processor = null)
public ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null)
{
Logger.Trace("Status");

Expand Down
6 changes: 3 additions & 3 deletions src/GitHub.Api/Git/RepositoryManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,10 @@ private void UpdateGitStatus()
var task = GitClient.Status()
.Finally((success, ex, data) =>
{
Logger.Trace($"GitStatus update: {success} {(data.HasValue ? data.Value.ToString() : "[null]")}");
if (success && data.HasValue)
Logger.Trace($"GitStatus update: {success} {data}");
if (success)
{
OnStatusUpdated?.Invoke(data.Value);
OnStatusUpdated?.Invoke(data);
Logger.Trace("Updated Git Status");
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/GitHub.Api/Git/Tasks/GitStatusTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

namespace GitHub.Unity
{
class GitStatusTask : ProcessTask<GitStatus?>
class GitStatusTask : ProcessTask<GitStatus>
{
private const string TaskName = "git status";

public GitStatusTask(IGitObjectFactory gitObjectFactory,
CancellationToken token, IOutputProcessor<GitStatus?> processor = null)
CancellationToken token, IOutputProcessor<GitStatus> processor = null)
: base(token, processor ?? new StatusOutputProcessor(gitObjectFactory))
{
Name = TaskName;
Expand Down
2 changes: 1 addition & 1 deletion src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace GitHub.Unity
{
class StatusOutputProcessor : BaseOutputProcessor<GitStatus?>
class StatusOutputProcessor : BaseOutputProcessor<GitStatus>
{
private static readonly Regex branchTrackedAndDelta = new Regex(@"(.*)\.\.\.(.*)\s\[(.*)\]",
RegexOptions.Compiled);
Expand Down
4 changes: 2 additions & 2 deletions src/tests/IntegrationTests/ProcessManagerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static ITask<List<GitLogEntry>> GetGitLogEntries(this IProcessManager pro
.Configure(processManager, path, logNameStatus, workingDirectory, false);
}

public static ITask<GitStatus?> GetGitStatus(this IProcessManager processManager,
public static ITask<GitStatus> GetGitStatus(this IProcessManager processManager,
NPath workingDirectory,
IEnvironment environment, IProcessEnvironment gitEnvironment,
NPath gitPath = null)
Expand All @@ -54,7 +54,7 @@ public static ITask<List<GitLogEntry>> GetGitLogEntries(this IProcessManager pro

NPath path = gitPath ?? defaultGitPath;

return new ProcessTask<GitStatus?>(CancellationToken.None, processor)
return new ProcessTask<GitStatus>(CancellationToken.None, processor)
.Configure(processManager, path, "status -b -u --porcelain", workingDirectory, false);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class CreateRepositoryProcessRunnerOptions
{
public Dictionary<GitConfigGetKey, string> GitConfigGetResults { get; set; }

public GitStatus? GitStatusResults { get; set; }
public GitStatus GitStatusResults { get; set; }

public List<GitLock> GitListLocksResults { get; set; }

public CreateRepositoryProcessRunnerOptions(Dictionary<GitConfigGetKey, string> getConfigResults = null,
GitStatus? gitStatusResults = null,
GitStatus gitStatusResults = new GitStatus(),
List<GitLock> gitListLocksResults = null)
{
GitListLocksResults = gitListLocksResults;
Expand Down
9 changes: 4 additions & 5 deletions src/tests/TestUtils/Substitutes/SubstituteFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -411,13 +411,12 @@ public IGitClient CreateRepositoryProcessRunner(
});

gitClient.Status().Returns(info => {
GitStatus? result = options.GitStatusResults;

var ret = new FuncTask<GitStatus?>(CancellationToken.None, _ => result);
var result = options.GitStatusResults;
var ret = new FuncTask<GitStatus>(CancellationToken.None, _ => result);

logger.Trace(@"RunGitStatus() -> {0}",
result != null ? $"Success: \"{result.Value}\"" : "Failure");
var task = Args.GitStatusTask;
$"Success: \"{result}\"");

return ret;
});

Expand Down
4 changes: 2 additions & 2 deletions src/tests/UnitTests/ProcessManagerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public static async Task<GitStatus> GetGitStatus(this ProcessManager processMana

NPath path = gitPath ?? defaultGitPath;

var results = await new ProcessTask<GitStatus?>(CancellationToken.None, processor)
var results = await new ProcessTask<GitStatus>(CancellationToken.None, processor)
.Configure(processManager, path, "status -b -u --porcelain", workingDirectory, false)
.Start()
.Task;

return results.Value;
return results;
}

public static async Task<List<GitRemote>> GetGitRemoteEntries(this ProcessManager processManager,
Expand Down