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

Commit 2c78785

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge branch 'master' into fixes/save-keychain-on-2fa-success
2 parents 80f2ba8 + 9e0666b commit 2c78785

File tree

10 files changed

+46
-20
lines changed

10 files changed

+46
-20
lines changed

‎.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ root = true
33
[*.cs]
44
indent_style = space
55
indent_size = 4
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true

‎README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
# [GitHub for Unity](https://unity.github.com)
22

3-
## Notices
3+
The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub into [Unity](https://unity3d.com/), integrating source control into your work with friendly and accessible tools and workflows.
44

5-
From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
5+
You can reach the team right here by opening a [new issue](https://github.com/github-for-unity/Unity/issues/new), or by joining one of the chats below. You can also email us at [email protected], or tweet at [@GitHubUnity](https://twitter.com/GitHubUnity)
66

7-
![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
7+
[![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)](https://ci.appveyor.com/project/github-windows/unity)
88

99
[![Join the chat at https://gitter.im/github-for-unity/Unity](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github-for-unity/Unity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1010
[![Join the chat at https://discord.gg/5zH8hVx](https://img.shields.io/badge/discord-join%20chat-7289DA.svg)](https://discord.gg/5zH8hVx)
1111
[![GitHub for Unity live coding on Twitch](https://img.shields.io/badge/twitch-live%20coding-6441A4.svg)](https://www.twitch.tv/sh4na)
1212

13-
## About
1413

15-
The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub into [Unity](https://unity3d.com/), integrating source control into your work with friendly and accessible tools and workflows.
14+
## Notices
15+
16+
This software is currently alpha quality. Please refer to the [list of known issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aissue+is%3Aopen+label%3Abug), and make sure you have backups of your work before trying it out.
1617

17-
**Please note:** this software is currently alpha quality. Please refer to the [list of known issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aissue+is%3Aopen+label%3Abug), and make sure you have backups of your work before trying it out.
18+
From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
1819

1920
#### Table Of Contents
2021

‎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.31.6";
34+
internal const string Version = "0.31.7";
3535
}
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void Start()
9292
{
9393
foreach (var cacheType in cacheInvalidationRequests)
9494
{
95-
RefreshCache(cacheType);
95+
CacheHasBeenInvalidated(cacheType);
9696
}
9797
}
9898

‎src/GitHub.Api/Git/Tasks/GitStatusTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class GitStatusTask : ProcessTask<GitStatus>
88

99
public GitStatusTask(IGitObjectFactory gitObjectFactory,
1010
CancellationToken token, IOutputProcessor<GitStatus> processor = null)
11-
: base(token, processor ?? new StatusOutputProcessor(gitObjectFactory))
11+
: base(token, processor ?? new GitStatusOutputProcessor(gitObjectFactory))
1212
{
1313
Name = TaskName;
1414
}

‎src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
namespace GitHub.Unity
77
{
8-
class StatusOutputProcessor : BaseOutputProcessor<GitStatus>
8+
class GitStatusOutputProcessor : BaseOutputProcessor<GitStatus>
99
{
1010
private static readonly Regex branchTrackedAndDelta = new Regex(@"(.*)\.\.\.(.*)\s\[(.*)\]",
1111
RegexOptions.Compiled);
1212

1313
private readonly IGitObjectFactory gitObjectFactory;
1414
GitStatus gitStatus;
1515

16-
public StatusOutputProcessor(IGitObjectFactory gitObjectFactory)
16+
public GitStatusOutputProcessor(IGitObjectFactory gitObjectFactory)
1717
{
1818
Guard.ArgumentNotNull(gitObjectFactory, "gitObjectFactory");
1919
this.gitObjectFactory = gitObjectFactory;
@@ -190,6 +190,10 @@ private void ReturnStatus()
190190
if (gitStatus.Entries == null)
191191
return;
192192

193+
gitStatus.Entries = gitStatus.Entries
194+
.OrderBy(entry => entry.Path)
195+
.ToList();
196+
193197
RaiseOnEntry(gitStatus);
194198

195199
gitStatus = new GitStatus();

‎src/tests/IntegrationTests/ProcessManagerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static ITask<GitStatus> GetGitStatus(this IProcessManager processManager,
5050
NPath? gitPath = null)
5151
{
5252
var gitStatusEntryFactory = new GitObjectFactory(environment);
53-
var processor = new StatusOutputProcessor(gitStatusEntryFactory);
53+
var processor = new GitStatusOutputProcessor(gitStatusEntryFactory);
5454

5555
NPath path = gitPath ?? defaultGitPath;
5656

‎src/tests/UnitTests/IO/StatusOutputProcessorTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace UnitTests
77
{
88
[TestFixture]
9-
class StatusOutputProcessorTests : BaseOutputProcessorTests
9+
class GitStatusOutputProcessorTests : BaseOutputProcessorTests
1010
{
1111

1212
[Test]
@@ -28,9 +28,9 @@ public void ShouldParseDirtyWorkingTreeUntracked()
2828
LocalBranch = "master",
2929
Entries = new List<GitStatusEntry>
3030
{
31+
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
3132
new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
3233
new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
33-
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
3434
new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
3535
new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
3636
}
@@ -59,9 +59,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1Behind1()
5959
Behind = 1,
6060
Entries = new List<GitStatusEntry>
6161
{
62+
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
6263
new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
6364
new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
64-
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
6565
new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
6666
new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
6767
}
@@ -89,9 +89,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1()
8989
Ahead = 1,
9090
Entries = new List<GitStatusEntry>
9191
{
92+
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
9293
new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
9394
new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
94-
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
9595
new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
9696
new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
9797
}
@@ -119,9 +119,9 @@ public void ShouldParseDirtyWorkingTreeTrackedBehind1()
119119
Behind = 1,
120120
Entries = new List<GitStatusEntry>
121121
{
122+
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
122123
new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
123124
new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
124-
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
125125
new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
126126
new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
127127
}
@@ -148,9 +148,9 @@ public void ShouldParseDirtyWorkingTreeTracked()
148148
RemoteBranch = "origin/master",
149149
Entries = new List<GitStatusEntry>
150150
{
151+
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
151152
new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
152153
new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
153-
new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
154154
new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
155155
new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
156156
}
@@ -250,7 +250,7 @@ private void AssertProcessOutput(IEnumerable<string> lines, GitStatus expected)
250250
var gitObjectFactory = SubstituteFactory.CreateGitObjectFactory(TestRootPath);
251251

252252
GitStatus? result = null;
253-
var outputProcessor = new StatusOutputProcessor(gitObjectFactory);
253+
var outputProcessor = new GitStatusOutputProcessor(gitObjectFactory);
254254
outputProcessor.OnEntry += status => { result = status; };
255255

256256
foreach (var line in lines)

‎src/tests/UnitTests/ProcessManagerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static async Task<GitStatus> GetGitStatus(this ProcessManager processMana
5858
NPath? gitPath = null)
5959
{
6060
var gitStatusEntryFactory = new GitObjectFactory(environment);
61-
var processor = new StatusOutputProcessor(gitStatusEntryFactory);
61+
var processor = new GitStatusOutputProcessor(gitStatusEntryFactory);
6262

6363
NPath path = gitPath ?? defaultGitPath;
6464

‎vim.exe.stackdump

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Stack trace:
2+
Frame Function Args
3+
00180238000 0018005D19E (00180223639, 00180223C39, 001802342F0, 000FFFFB720)
4+
00180238000 001800463F9 (C0C0C000008080, FF000000808080, FFFF000000FF00, FF00FF000000FF)
5+
00180238000 00180046432 (00180223616, 000000001E7, 001802342F0, 80808000C0C0C0)
6+
00180238000 001800431E3 (00000000000, 00180238000, 7FF9F466D9EE, 001800004EC)
7+
00180238000 0018006B101 (C0C0C000008080, FF000000808080, FFFF000000FF00, FF00FF000000FF)
8+
00180238000 0018006BF4C (00000000000, 0010065D548, 00000000000, 00000000000)
9+
00180238000 0018006E066 (00000000000, 00000000008, 005FCB3E280, 00000000000)
10+
00000000001 00180135376 (0010065D540, 00000000008, 00000000000, 00000000000)
11+
00000000001 0018011C6FB (0010065D540, 00000000008, 00000000000, 00000000000)
12+
00000000001 001004F77E4 (00100575E0A, 00100663D08, 00000000000, 00100663D0C)
13+
00000000001 001005820F3 (00000000008, 00100664140, 00000000000, 00000000000)
14+
00000000001 00100576D86 (000241E9F28, 0005A6893D4, 000241E9F28, 00000010000)
15+
00000000001 001005D4CEB (000FFFFCB98, 001801CA1F0, 00100000001, 00000000001)
16+
0060004AFE0 001005E218A (00000000020, 30001000000FF00, 00180047986, 00180046990)
17+
000FFFFCCB0 001800479F7 (00000000000, 00000000000, 00000000000, 00000000000)
18+
00000000000 00180045663 (00000000000, 00000000000, 00000000000, 00000000000)
19+
End of stack trace (more stack frames may be present)

0 commit comments

Comments
 (0)