Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit bac56f2

Browse files
authored
Merge pull request #375 from github-for-unity/fixes/cleanup
Warning cleanup
2 parents 4a11234 + 3a22ba4 commit bac56f2

28 files changed

+25
-284
lines changed

src/GitHub.Api/Application/ApiClient.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Threading;
54
using System.Threading.Tasks;
65
using Octokit;
76

@@ -27,14 +26,10 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
2726
private readonly IKeychain keychain;
2827
private readonly IGitHubClient githubClient;
2928
private readonly ILoginManager loginManager;
30-
private static readonly SemaphoreSlim sem = new SemaphoreSlim(1);
3129

3230
IList<Organization> organizationsCache;
3331
Octokit.User userCache;
3432

35-
string owner;
36-
bool? isEnterprise;
37-
3833
public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient)
3934
{
4035
Guard.ArgumentNotNull(hostUrl, nameof(hostUrl));

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected void Initialize()
3939
Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
4040
ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
4141
Platform.Initialize(ProcessManager, TaskManager);
42-
GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager);
42+
GitClient = new GitClient(Environment, ProcessManager, TaskManager);
4343
SetupMetrics();
4444
}
4545

@@ -127,7 +127,7 @@ public void RestartRepository()
127127
{
128128
if (Environment.RepositoryPath != null)
129129
{
130-
repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, UsageTracker, GitClient, Environment.RepositoryPath);
130+
repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath);
131131
repositoryManager.Initialize();
132132
Environment.Repository.Initialize(repositoryManager);
133133
repositoryManager.Start();

src/GitHub.Api/Events/RepositoryWatcher.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ class RepositoryWatcher : IRepositoryWatcher
3030
private readonly CancellationToken cancellationToken;
3131
private readonly NPath[] ignoredPaths;
3232
private readonly ManualResetEventSlim pauseEvent;
33-
private readonly bool disableNative;
3433
private NativeInterface nativeInterface;
3534
private bool running;
36-
private Task task;
3735
private int lastCountOfProcessedEvents = 0;
3836
private bool processingEvents;
3937
private readonly ManualResetEventSlim signalProcessingEventsDone = new ManualResetEventSlim(false);
@@ -68,8 +66,7 @@ public void Initialize()
6866

6967
try
7068
{
71-
if (!disableNative)
72-
nativeInterface = new NativeInterface(pathsRepositoryPath);
69+
nativeInterface = new NativeInterface(pathsRepositoryPath);
7370
}
7471
catch (Exception ex)
7572
{
@@ -79,12 +76,6 @@ public void Initialize()
7976

8077
public void Start()
8178
{
82-
if (disableNative)
83-
{
84-
Logger.Trace("Native interface is disabled");
85-
return;
86-
}
87-
8879
if (nativeInterface == null)
8980
{
9081
Logger.Warning("NativeInterface is null");
@@ -95,7 +86,7 @@ public void Start()
9586

9687
running = true;
9788
pauseEvent.Reset();
98-
task = Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
89+
Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
9990
}
10091

10192
public void Stop()

src/GitHub.Api/Git/GitClient.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,13 @@ class GitClient : IGitClient
8787
{
8888
private readonly IEnvironment environment;
8989
private readonly IProcessManager processManager;
90-
private readonly ICredentialManager credentialManager;
9190
private readonly ITaskManager taskManager;
9291
private readonly CancellationToken cancellationToken;
9392

94-
public GitClient(IEnvironment environment, IProcessManager processManager,
95-
ICredentialManager credentialManager, ITaskManager taskManager)
93+
public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager)
9694
{
9795
this.environment = environment;
9896
this.processManager = processManager;
99-
this.credentialManager = credentialManager;
10097
this.taskManager = taskManager;
10198
this.cancellationToken = taskManager.Token;
10299
}

src/GitHub.Api/Git/GitConfig.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@ public string GetString(string key)
216216
public int GetInt(string key)
217217
{
218218
var value = this[key];
219-
var result = 0;
220-
var success = int.TryParse(value, out result);
219+
int result = 0;
220+
int.TryParse(value, out result);
221221
return result;
222222
}
223223

224224
public float GetFloat(string key)
225225
{
226226
var value = this[key];
227-
var result = 0F;
228-
var success = float.TryParse(value, out result);
227+
float result = 0F;
228+
float.TryParse(value, out result);
229229
return result;
230230
}
231231

src/GitHub.Api/Git/GitCredentialManager.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ class GitCredentialManager : ICredentialManager
1111
private ICredential credential;
1212
private string credHelper = null;
1313

14-
private readonly IEnvironment environment;
1514
private readonly IProcessManager processManager;
1615
private readonly ITaskManager taskManager;
1716

18-
public GitCredentialManager(IEnvironment environment, IProcessManager processManager,
17+
public GitCredentialManager(IProcessManager processManager,
1918
ITaskManager taskManager)
2019
{
21-
this.environment = environment;
2220
this.processManager = processManager;
2321
this.taskManager = taskManager;
2422
}

src/GitHub.Api/Git/RepositoryManager.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Threading;
54
using System.Threading.Tasks;
65

76
namespace GitHub.Unity
@@ -94,13 +93,11 @@ public RepositoryPathConfiguration(NPath repositoryPath)
9493

9594
class RepositoryManager : IRepositoryManager
9695
{
97-
private readonly CancellationToken cancellationToken;
9896
private readonly IGitConfig config;
9997
private readonly IGitClient gitClient;
10098
private readonly IPlatform platform;
10199
private readonly IRepositoryPathConfiguration repositoryPaths;
102100
private readonly ITaskManager taskManager;
103-
private readonly IUsageTracker usageTracker;
104101
private readonly IRepositoryWatcher watcher;
105102

106103
private bool isBusy;
@@ -119,23 +116,21 @@ class RepositoryManager : IRepositoryManager
119116
public event Action<string, string> OnRemoteBranchRemoved;
120117
public event Action<GitStatus> OnStatusUpdated;
121118

122-
public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker, IGitConfig gitConfig,
119+
public RepositoryManager(IPlatform platform, ITaskManager taskManager, IGitConfig gitConfig,
123120
IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
124-
IRepositoryPathConfiguration repositoryPaths, CancellationToken cancellationToken)
121+
IRepositoryPathConfiguration repositoryPaths)
125122
{
126123
this.repositoryPaths = repositoryPaths;
127124
this.platform = platform;
128125
this.taskManager = taskManager;
129-
this.usageTracker = usageTracker;
130-
this.cancellationToken = cancellationToken;
131126
this.gitClient = gitClient;
132127
this.watcher = repositoryWatcher;
133128
this.config = gitConfig;
134129

135130
SetupWatcher();
136131
}
137132

138-
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
133+
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager,
139134
IGitClient gitClient, NPath repositoryRoot)
140135
{
141136
var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
@@ -144,8 +139,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
144139

145140
var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
146141

147-
return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
148-
gitClient, repositoryPathConfiguration, taskManager.Token);
142+
return new RepositoryManager(platform, taskManager, gitConfig, repositoryWatcher,
143+
gitClient, repositoryPathConfiguration);
149144
}
150145

151146
public void Initialize()

src/GitHub.Api/Helpers/SimpleJson.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ static class SimpleJson
517517

518518
private static readonly char[] EscapeTable;
519519
private static readonly char[] EscapeCharacters = new char[] { '"', '\\', '\b', '\f', '\n', '\r', '\t' };
520-
private static readonly string EscapeCharactersString = new string(EscapeCharacters);
521520

522521
static SimpleJson()
523522
{

src/GitHub.Api/NewTaskSystem/BaseOutputProcessor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public override void LineReceived(string line)
8484

8585
abstract class FirstResultOutputProcessor<T> : BaseOutputProcessor<T>
8686
{
87-
private readonly StringBuilder sb = new StringBuilder();
8887
private bool isSet = false;
8988
public override void LineReceived(string line)
9089
{

src/GitHub.Api/Platform/Platform.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public IPlatform Initialize(IProcessManager processManager, ITaskManager taskMan
2626

2727
if (CredentialManager == null)
2828
{
29-
CredentialManager = new GitCredentialManager(Environment, processManager, taskManager);
29+
CredentialManager = new GitCredentialManager(processManager, taskManager);
3030
Keychain = new Keychain(Environment, CredentialManager);
3131
Keychain.Initialize();
3232
}

0 commit comments

Comments
 (0)