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

Commit bb58795

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge remote-tracking branch 'remotes/origin/fixes/update-after-push' into fixes/split-status-cache
# Conflicts: # src/GitHub.Api/GitHub.Api.csproj # src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
2 parents 6346098 + 2ff8713 commit bb58795

File tree

19 files changed

+424
-139
lines changed

19 files changed

+424
-139
lines changed

‎common/SolutionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.23.0";
34+
internal const string Version = "0.24.0";
3535
}
3636
}

‎src/GitHub.Api/Cache/CacheInterfaces.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ public interface IGitUserCache : IManagedCache
5555

5656
public interface IGitStatusCache : IManagedCache
5757
{
58-
GitStatus GitStatus { get; set; }
58+
int Ahead { get; set; }
59+
int Behind { get; set; }
60+
List<GitStatusEntry> Entries { get; set; }
5961
}
6062

6163
public interface ILocalConfigBranchDictionary : IDictionary<string, ConfigBranch>

‎src/GitHub.Api/Extensions/GitStatusExtensions.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/GitHub.Api/Git/GitAheadBehindStatus.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
3+
namespace GitHub.Unity
4+
{
5+
[Serializable]
6+
public struct GitAheadBehindStatus
7+
{
8+
public static GitAheadBehindStatus Default = new GitAheadBehindStatus();
9+
10+
public int ahead;
11+
public int behind;
12+
13+
public GitAheadBehindStatus(int ahead, int behind)
14+
{
15+
this.ahead = ahead;
16+
this.behind = behind;
17+
}
18+
19+
public int Ahead => ahead;
20+
21+
public int Behind => behind;
22+
}
23+
}

‎src/GitHub.Api/Git/GitClient.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ public interface IGitClient
1515

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

18+
ITask<GitAheadBehindStatus> AheadBehindStatus(string gitRef, string otherRef,
19+
IOutputProcessor<GitAheadBehindStatus> processor = null);
20+
1821
ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null);
1922

2023
ITask<string> GetConfig(string key, GitConfigSource configSource,
@@ -219,6 +222,14 @@ public ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null)
219222
.Configure(processManager);
220223
}
221224

225+
public ITask<GitAheadBehindStatus> AheadBehindStatus(string gitRef, string otherRef, IOutputProcessor<GitAheadBehindStatus> processor = null)
226+
{
227+
Logger.Trace("AheadBehindStatus");
228+
229+
return new GitAheadBehindStatusTask(gitRef, otherRef, cancellationToken, processor)
230+
.Configure(processManager);
231+
}
232+
222233
public ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> processor = null)
223234
{
224235
Logger.Trace("Log");

‎src/GitHub.Api/Git/GitRemote.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public enum GitRemoteFunction
1414
[Serializable]
1515
public struct GitRemote
1616
{
17-
public static GitRemote Default = new GitRemote();
17+
public static GitRemote Default = new GitRemote(String.Empty, String.Empty, String.Empty, GitRemoteFunction.Unknown, string.Empty, string.Empty, string.Empty);
1818

1919
public string name;
2020
public string url;

‎src/GitHub.Api/Git/IRepository.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public interface IRepository : IEquatable<IRepository>
5757
/// Gets the current branch of the repository.
5858
/// </summary>
5959
GitBranch? CurrentBranch { get; }
60-
GitStatus CurrentStatus { get; }
60+
int CurrentAhead { get; }
61+
int CurrentBehind { get; }
62+
List<GitStatusEntry> CurrentChanges { get; }
6163
GitRemote[] Remotes { get; }
6264
GitBranch[] LocalBranches { get; }
6365
GitBranch[] RemoteBranches { get; }

‎src/GitHub.Api/Git/Repository.cs‎

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public void Initialize(IRepositoryManager initRepositoryManager)
4949
repositoryManager = initRepositoryManager;
5050
repositoryManager.CurrentBranchUpdated += RepositoryManagerOnCurrentBranchUpdated;
5151
repositoryManager.GitStatusUpdated += RepositoryManagerOnGitStatusUpdated;
52+
repositoryManager.GitAheadBehindStatusUpdated += RepositoryManagerOnGitAheadBehindStatusUpdated;
5253
repositoryManager.GitLogUpdated += RepositoryManagerOnGitLogUpdated;
54+
repositoryManager.GitLocksUpdated += RepositoryManagerOnGitLocksUpdated;
5355
repositoryManager.LocalBranchesUpdated += RepositoryManagerOnLocalBranchesUpdated;
5456
repositoryManager.RemoteBranchesUpdated += RepositoryManagerOnRemoteBranchesUpdated;
5557
}
@@ -266,7 +268,7 @@ private void CacheContainer_OnCacheInvalidated(CacheType cacheType)
266268
break;
267269

268270
case CacheType.GitLocksCache:
269-
repositoryManager?.UpdateLocks();
271+
UpdateLocks();
270272
break;
271273

272274
case CacheType.GitUserCache:
@@ -352,26 +354,36 @@ private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, Confi
352354
new ActionTask(CancellationToken.None, () => {
353355
if (!Nullable.Equals(CurrentConfigBranch, branch))
354356
{
355-
var currentBranch = branch != null ? (GitBranch?)GetLocalGitBranch(branch.Value) : null;
357+
var currentBranch = branch != null ? (GitBranch?)GetLocalGitBranch(branch.Value) : null;
356358

357-
CurrentConfigBranch = branch;
358-
CurrentBranch = currentBranch;
359-
UpdateLocalBranches();
359+
CurrentConfigBranch = branch;
360+
CurrentBranch = currentBranch;
361+
UpdateLocalBranches();
360362
}
361363

362364
if (!Nullable.Equals(CurrentConfigRemote, remote))
363365
{
364-
CurrentConfigRemote = remote;
365-
CurrentRemote = GetGitRemote(remote.Value);
366-
ClearRepositoryInfo();
366+
CurrentConfigRemote = remote;
367+
CurrentRemote = remote.HasValue ? (GitRemote?)GetGitRemote(remote.Value) : null;
368+
ClearRepositoryInfo();
367369
}
368370
}) { Affinity = TaskAffinity.UI }.Start();
369371
}
370372

371373
private void RepositoryManagerOnGitStatusUpdated(GitStatus gitStatus)
372374
{
373375
new ActionTask(CancellationToken.None, () => {
374-
CurrentStatus = gitStatus;
376+
CurrentChanges = gitStatus.Entries;
377+
CurrentAhead = gitStatus.Ahead;
378+
CurrentBehind = gitStatus.Behind;
379+
}) { Affinity = TaskAffinity.UI }.Start();
380+
}
381+
382+
private void RepositoryManagerOnGitAheadBehindStatusUpdated(GitAheadBehindStatus aheadBehindStatus)
383+
{
384+
new ActionTask(CancellationToken.None, () => {
385+
CurrentAhead = aheadBehindStatus.Ahead;
386+
CurrentBehind = aheadBehindStatus.Behind;
375387
}) { Affinity = TaskAffinity.UI }.Start();
376388
}
377389

@@ -382,6 +394,14 @@ private void RepositoryManagerOnGitLogUpdated(List<GitLogEntry> gitLogEntries)
382394
}) { Affinity = TaskAffinity.UI }.Start();
383395
}
384396

397+
private void RepositoryManagerOnGitLocksUpdated(List<GitLock> gitLocks)
398+
{
399+
new ActionTask(CancellationToken.None, () => {
400+
CurrentLocks = gitLocks;
401+
})
402+
{ Affinity = TaskAffinity.UI }.Start();
403+
}
404+
385405
private void RepositoryManagerOnRemoteBranchesUpdated(Dictionary<string, ConfigRemote> remotes,
386406
Dictionary<string, Dictionary<string, ConfigBranch>> branches)
387407
{
@@ -400,6 +420,14 @@ private void RepositoryManagerOnLocalBranchesUpdated(Dictionary<string, ConfigBr
400420
}) { Affinity = TaskAffinity.UI }.Start();
401421
}
402422

423+
private void UpdateLocks()
424+
{
425+
if (CurrentRemote.HasValue)
426+
{
427+
repositoryManager?.UpdateLocks();
428+
}
429+
}
430+
403431
private void UpdateLocalBranches()
404432
{
405433
LocalBranches = LocalConfigBranches.Values.Select(GetLocalGitBranch).ToArray();
@@ -468,10 +496,22 @@ private ConfigRemote? CurrentConfigRemote
468496
set { cacheContainer.BranchCache.CurrentConfigRemote = value; }
469497
}
470498

471-
public GitStatus CurrentStatus
499+
public int CurrentAhead
500+
{
501+
get { return cacheContainer.GitStatusCache.Ahead; }
502+
private set { cacheContainer.GitStatusCache.Ahead = value; }
503+
}
504+
505+
public int CurrentBehind
506+
{
507+
get { return cacheContainer.GitStatusCache.Behind; }
508+
private set { cacheContainer.GitStatusCache.Behind = value; }
509+
}
510+
511+
public List<GitStatusEntry> CurrentChanges
472512
{
473-
get { return cacheContainer.GitStatusCache.GitStatus; }
474-
private set { cacheContainer.GitStatusCache.GitStatus = value; }
513+
get { return cacheContainer.GitStatusCache.Entries; }
514+
private set { cacheContainer.GitStatusCache.Entries = value; }
475515
}
476516

477517
public GitBranch? CurrentBranch

‎src/GitHub.Api/Git/RepositoryManager.cs‎

Lines changed: 58 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ public interface IRepositoryManager : IDisposable
3535
ITask UnlockFile(string file, bool force);
3636
void UpdateGitLog();
3737
void UpdateGitStatus();
38+
void UpdateGitAheadBehindStatus();
3839
void UpdateLocks();
3940
int WaitForEvents();
4041

4142
IGitConfig Config { get; }
4243
IGitClient GitClient { get; }
4344
bool IsBusy { get; }
45+
event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
4446
}
4547

4648
interface IRepositoryPathConfiguration
@@ -101,6 +103,7 @@ class RepositoryManager : IRepositoryManager
101103
public event Action<ConfigBranch?, ConfigRemote?> CurrentBranchUpdated;
102104
public event Action<bool> IsBusyChanged;
103105
public event Action<GitStatus> GitStatusUpdated;
106+
public event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
104107
public event Action<List<GitLock>> GitLocksUpdated;
105108
public event Action<List<GitLogEntry>> GitLogUpdated;
106109
public event Action<Dictionary<string, ConfigBranch>> LocalBranchesUpdated;
@@ -209,25 +212,13 @@ public ITask RemoteAdd(string remote, string url)
209212
{
210213
var task = GitClient.RemoteAdd(remote, url);
211214
task = HookupHandlers(task, true, false);
212-
if (!platform.Environment.IsWindows)
213-
{
214-
task.Then(_ => {
215-
UpdateConfigData(true);
216-
});
217-
}
218215
return task;
219216
}
220217

221218
public ITask RemoteRemove(string remote)
222219
{
223220
var task = GitClient.RemoteRemove(remote);
224221
task = HookupHandlers(task, true, false);
225-
if (!platform.Environment.IsWindows)
226-
{
227-
task.Then(_ => {
228-
UpdateConfigData(true);
229-
});
230-
}
231222
return task;
232223
}
233224

@@ -258,13 +249,13 @@ public ITask CreateBranch(string branch, string baseBranch)
258249
public ITask LockFile(string file)
259250
{
260251
var task = GitClient.Lock(file);
261-
return HookupHandlers(task, true, false);
252+
return HookupHandlers(task, true, false).Then(UpdateLocks);
262253
}
263254

264255
public ITask UnlockFile(string file, bool force)
265256
{
266257
var task = GitClient.Unlock(file, force);
267-
return HookupHandlers(task, true, false);
258+
return HookupHandlers(task, true, false).Then(UpdateLocks);
268259
}
269260

270261
public void UpdateGitLog()
@@ -293,6 +284,33 @@ public void UpdateGitStatus()
293284
}).Start();
294285
}
295286

287+
public void UpdateGitAheadBehindStatus()
288+
{
289+
ConfigBranch? configBranch;
290+
ConfigRemote? configRemote;
291+
GetCurrentBranchAndRemote(out configBranch, out configRemote);
292+
293+
if (configBranch.HasValue && configBranch.Value.Remote.HasValue)
294+
{
295+
var name = configBranch.Value.Name;
296+
var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
297+
298+
var task = GitClient.AheadBehindStatus(name, trackingName);
299+
task = HookupHandlers(task, true, false);
300+
task.Then((success, status) =>
301+
{
302+
if (success)
303+
{
304+
GitAheadBehindStatusUpdated?.Invoke(status);
305+
}
306+
}).Start();
307+
}
308+
else
309+
{
310+
GitAheadBehindStatusUpdated?.Invoke(GitAheadBehindStatus.Default);
311+
}
312+
}
313+
296314
public void UpdateLocks()
297315
{
298316
var task = GitClient.ListLocks(false);
@@ -357,15 +375,33 @@ private void SetupWatcher()
357375

358376
private void UpdateHead()
359377
{
360-
var head = repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
361-
Logger.Trace("UpdateHead: {0}", head ?? "[NULL]");
362-
UpdateCurrentBranchAndRemote(head);
378+
Logger.Trace("UpdateHead");
379+
UpdateCurrentBranchAndRemote();
380+
UpdateGitLog();
381+
}
382+
383+
private string GetCurrentHead()
384+
{
385+
return repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
386+
}
387+
388+
private void UpdateCurrentBranchAndRemote()
389+
{
390+
ConfigBranch? branch;
391+
ConfigRemote? remote;
392+
GetCurrentBranchAndRemote(out branch, out remote);
393+
394+
Logger.Trace("CurrentBranch: {0}", branch.HasValue ? branch.Value.ToString() : "[NULL]");
395+
Logger.Trace("CurrentRemote: {0}", remote.HasValue ? remote.Value.ToString() : "[NULL]");
396+
CurrentBranchUpdated?.Invoke(branch, remote);
363397
}
364398

365-
private void UpdateCurrentBranchAndRemote(string head)
399+
private void GetCurrentBranchAndRemote(out ConfigBranch? branch, out ConfigRemote? remote)
366400
{
367-
ConfigBranch? branch = null;
401+
branch = null;
402+
remote = null;
368403

404+
var head = GetCurrentHead();
369405
if (head.StartsWith("ref:"))
370406
{
371407
var branchName = head.Substring(head.IndexOf("refs/heads/") + "refs/heads/".Length);
@@ -378,7 +414,6 @@ private void UpdateCurrentBranchAndRemote(string head)
378414
}
379415

380416
var defaultRemote = "origin";
381-
ConfigRemote? remote = null;
382417

383418
if (branch.HasValue && branch.Value.IsTracking)
384419
{
@@ -398,10 +433,6 @@ private void UpdateCurrentBranchAndRemote(string head)
398433
remote = configRemotes.FirstOrDefault();
399434
}
400435
}
401-
402-
Logger.Trace("CurrentBranch: {0}", branch.HasValue ? branch.Value.ToString() : "[NULL]");
403-
Logger.Trace("CurrentRemote: {0}", remote.HasValue ? remote.Value.ToString() : "[NULL]");
404-
CurrentBranchUpdated?.Invoke(branch, remote);
405436
}
406437

407438
private void WatcherOnRemoteBranchesChanged()
@@ -420,6 +451,7 @@ private void WatcherOnRepositoryCommitted()
420451
{
421452
Logger.Trace("WatcherOnRepositoryCommitted");
422453
UpdateGitLog();
454+
UpdateGitAheadBehindStatus();
423455
}
424456

425457
private void WatcherOnRepositoryChanged()
@@ -518,6 +550,8 @@ private void UpdateRemoteBranches()
518550

519551
Logger.Trace("OnRemoteBranchListUpdated {0} remotes", remotes.Count);
520552
RemoteBranchesUpdated?.Invoke(remotes, remoteBranches);
553+
554+
UpdateGitAheadBehindStatus();
521555
}
522556

523557
private bool disposed;

0 commit comments

Comments
 (0)