fixup! [WIP] Introduce CommitFilter.Parse()

nulltoken · nulltoken · commit 28016db87ebc · 2015-10-25T10:17:32.000+01:00
diff --git a/LibGit2Sharp.Tests/CommitFilterFixture.cs b/LibGit2Sharp.Tests/CommitFilterFixture.cs
@@ -11,6 +11,7 @@ public class CommitFilterFixture : BaseFixture
         [InlineData("HEAD^", "HEAD^", null)]
         [InlineData("HEAD^..HEAD", "HEAD", "HEAD^")]
         [InlineData("HEAD^..", null, "HEAD^")]
+        [InlineData("..HEAD^", "HEAD^", null)]
         public void tada(string expression, object includeReachableFrom, object excludeReachableFrom)
         {
             CommitFilter cf = CommitFilter.Parse(expression);
@@ -19,6 +20,14 @@ public void tada(string expression, object includeReachableFrom, object excludeR
             Assert.Equal(excludeReachableFrom, cf.ExcludeReachableFrom);
         }
 
+        [Theory]
+        [InlineData("..")]
+        [InlineData("...")]
+        public void tada2(string expression)
+        {
+            Assert.Throws<InvalidOperationException>(() => CommitFilter.Parse(expression));
+        }
+
         [Fact]
         public void throws()
         {
diff --git a/LibGit2Sharp/CommitFilter.cs b/LibGit2Sharp/CommitFilter.cs
@@ -148,18 +148,49 @@ public static CommitFilter Parse(string expression)
 
         private static CommitFilter MergeRangeParse(string expression)
         {
+            var parts = Strings(expression, "...");
+
             throw new NotImplementedException();
         }
 
         private static CommitFilter RangeParse(string expression)
         {
-            var parts = expression.Split(new[] { ".." }, StringSplitOptions.None);
+            var parts = Strings(expression, "..");
+
+            return new CommitFilter { IncludeReachableFrom = parts[1], ExcludeReachableFrom = parts[0] };
+        }
+
+        static readonly Func<string, string> Nullify = s => s == string.Empty ? null : s;
+
+        private static string[] Strings(string expression, string rangeSeparator)
+        {
+            var parts = expression.Split(new[] { rangeSeparator }, StringSplitOptions.None);
+
+            if (parts.Length != 2)
+            {
+                throw new InvalidOperationException();
+            }
 
-            Debug.Assert(parts.Length == 2);
+            int nullsCount = 0;
+
+            for (int i = 0; i < parts.Length; i++)
+            {
+                string part = Nullify(parts[i]);
 
-            Func<string, string> nullify = (s) => s == string.Empty ? null : s;
+                if (part == default(string))
+                {
+                    nullsCount++;
+                }
+
+                if (nullsCount > 1)
+                {
+                    throw new InvalidOperationException();
+                }
+
+                parts[i] = part;
+            }
 
-            return new CommitFilter { IncludeReachableFrom = nullify(parts[1]), ExcludeReachableFrom = nullify(parts[0]) };
+            return parts;
         }
     }
 }
