Allow lock IDs to be strings, some servers return that instead of ints (#788)

Fixes #786

Author: shana

src/GitHub.Api/Git/GitLock.cs

@@ -9,7 +9,7 @@ public struct GitLock
     {
         public static GitLock Default = new GitLock();
 
-        public int id;
+        public string id;
         public string path;
         public GitUser owner;
         [NotSerialized] public string lockedAtString;
@@ -21,6 +21,7 @@ public DateTimeOffset locked_at
                 if (!DateTimeOffset.TryParseExact(lockedAtString, Constants.Iso8601Formats,
                         CultureInfo.InvariantCulture, Constants.DateTimeStyle, out dt))
                 {
+                    locked_at = DateTimeOffset.MinValue;
                     return DateTimeOffset.MinValue;
                 }
                 return dt;
@@ -30,15 +31,15 @@ public DateTimeOffset locked_at
                 lockedAtString = value.ToUniversalTime().ToString(Constants.Iso8601FormatZ, CultureInfo.InvariantCulture);
             }
         }
-        [NotSerialized] public int ID => id;
-        [NotSerialized] public NPath Path => path.ToNPath();
+        [NotSerialized] public string ID => id ?? String.Empty;
+        [NotSerialized] public NPath Path => path?.ToNPath() ?? NPath.Default;
         [NotSerialized] public GitUser Owner => owner;
         [NotSerialized] public DateTimeOffset LockedAt => locked_at;
 
-        public GitLock(int id, NPath path, GitUser owner, DateTimeOffset locked_at)
+        public GitLock(string id, NPath path, GitUser owner, DateTimeOffset locked_at)
         {
             this.id = id;
-            this.path = path;
+            this.path = path.IsInitialized ? path.ToString() : null;
             this.owner = owner;
             this.lockedAtString = locked_at.ToUniversalTime().ToString(Constants.Iso8601FormatZ, CultureInfo.InvariantCulture);
         }
@@ -58,7 +59,7 @@ public bool Equals(GitLock other)
         public override int GetHashCode()
         {
             int hash = 17;
-            hash = hash * 23 + id.GetHashCode();
+            hash = hash * 23 + ID.GetHashCode();
             hash = hash * 23 + Path.GetHashCode();
             hash = hash * 23 + owner.GetHashCode();
             hash = hash * 23 + locked_at.GetHashCode();
@@ -67,7 +68,7 @@ public override int GetHashCode()
 
         public static bool operator ==(GitLock lhs, GitLock rhs)
         {
-            return lhs.id == rhs.id && lhs.Path == rhs.Path && lhs.owner == rhs.owner && lhs.locked_at == rhs.locked_at;
+            return lhs.ID == rhs.ID && lhs.Path == rhs.Path && lhs.owner == rhs.owner && lhs.locked_at == rhs.locked_at;
         }
 
         public static bool operator !=(GitLock lhs, GitLock rhs)
@@ -76,7 +77,7 @@ public override int GetHashCode()
         }
         public override string ToString()
         {
-            return $"{{id:{id}, path:{Path}, owner:{{{owner}}}, locked_at:'{locked_at}'}}";
+            return $"{{ID:{ID}, path:{Path}, owner:{{{owner}}}, locked_at:'{locked_at}'}}";
         }
     }
 }

src/GitHub.Api/IO/NiceIO.cs

@@ -474,6 +474,8 @@ public override int GetHashCode()
                 int hash = 17;
                 // Suitable nullity checks etc, of course :)
                 hash = hash * 23 + _isInitialized.GetHashCode();
+                if (!_isInitialized)
+                    return hash;
                 hash = hash * 23 + _isRelative.GetHashCode();
                 foreach (var element in _elements)
                     hash = hash * 23 + (IsUnix ? element : element.ToUpperInvariant()).GetHashCode();

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs

@@ -215,7 +215,7 @@ public void Load(List<GitLock> locks, List<GitStatusEntry> gitStatusEntries)
             for (int i = 0; i < gitStatusEntries.Count; i++)
                 statusEntries.Add(gitStatusEntries[i].Path.ToNPath().ToString(SlashMode.Forward), i);
             var selectedLockId = SelectedEntry != null && SelectedEntry.GitLock != GitLock.Default
-                ? (int?) SelectedEntry.GitLock.ID 
+                ? SelectedEntry.GitLock.ID
                 : null;
 
             var scrollValue = scroll.y;
@@ -249,7 +249,7 @@ public void Load(List<GitLock> locks, List<GitStatusEntry> gitStatusEntries)
             for (var index = 0; index < gitLockEntries.Count; index++)
             {
                 var gitLockEntry = gitLockEntries[index];
-                if (selectedLockId.HasValue && selectedLockId.Value == gitLockEntry.GitLock.ID)
+                if (selectedLockId == gitLockEntry.GitLock.ID)
                 {
                     selectedEntry = gitLockEntry;
                     selectionPresent = true;

src/tests/UnitTests/IO/LockOutputProcessorTests.cs

@@ -9,7 +9,7 @@
 namespace UnitTests
 {
     [TestFixture]
-    class LockOutputProcessorTests : BaseOutputProcessorTests
+    class LocksTests : BaseOutputProcessorTests
     {
         private void AssertProcessOutput(IEnumerable<string> lines, GitLock[] expected)
         {
@@ -51,25 +51,39 @@ public void ShouldParseZeroLocksFormat2()
         }
 
         [Test]
-        public void ShouldParseTwoLocksFormat1()
+        public void ShouldParseTwoLocksFormat()
         {
             var now = DateTimeOffset.ParseExact(DateTimeOffset.UtcNow.ToString(Constants.Iso8601FormatZ), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
             var output = new[]
             {
                 @"[{""id"":""12"", ""path"":""folder/somefile.png"", ""owner"":{""name"":""GitHub User""}, ""locked_at"":""" + now.ToString(Constants.Iso8601FormatZ) + "\"}" +
-                @" ,{""id"":""21"", ""path"":""somezip.zip"", ""owner"":{""name"":""GitHub User""}, ""locked_at"":""" + now.ToString(Constants.Iso8601FormatZ) + "\"}]",
+                @" ,{""id"":""2f9cfde9c159d50e235cc1402c3e534b0bf2198afb20760697a5f9b07bf04fb3"", ""path"":""somezip.zip"", ""owner"":{""name"":""GitHub User""}, ""locked_at"":""" + now.ToString(Constants.Iso8601FormatZ) + "\"}]",
                 string.Empty,
                 "2 lock(s) matched query.",
                 null
             };
 
             var expected = new[] {
-                new GitLock(12, "folder/somefile.png".ToNPath(), new GitUser("GitHub User", ""), now),
-                new GitLock(21, "somezip.zip".ToNPath(), new GitUser("GitHub User", ""), now)
+                new GitLock("12", "folder/somefile.png".ToNPath(), new GitUser("GitHub User", ""), now),
+                new GitLock("2f9cfde9c159d50e235cc1402c3e534b0bf2198afb20760697a5f9b07bf04fb3", "somezip.zip".ToNPath(), new GitUser("GitHub User", ""), now)
             };
 
 
-         AssertProcessOutput(output, expected);
+            AssertProcessOutput(output, expected);
+        }
+
+        [Test]
+        public void GitLockComparisons()
+        {
+            GitLock lock1 = GitLock.Default;
+            GitLock lock2 = GitLock.Default;
+            Assert.IsTrue(lock1.Equals(lock2));
+            Assert.IsTrue(lock1 == lock2);
+            // these are the defaults
+            lock1 = new GitLock(null, NPath.Default, GitUser.Default, DateTimeOffset.MinValue);
+            lock2 = new GitLock();
+            Assert.IsTrue(lock1.Equals(lock2));
+            Assert.IsTrue(lock1 == lock2);
         }
     }
 }