Introduce internal ICommittish

dahlbyk · dahlbyk · commit 3b520f19e1b8 · 2014-04-09T16:14:25.000-05:00
diff --git a/LibGit2Sharp.Tests/MetaFixture.cs b/LibGit2Sharp.Tests/MetaFixture.cs
@@ -114,7 +114,7 @@ public void LibGit2SharpInterfacesCoverAllPublicMembers()
             var methodsMissingFromInterfaces =
                 from t in Assembly.GetAssembly(typeof(IRepository)).GetExportedTypes()
                 where !t.IsInterface
-                where t.GetInterfaces().Any(i => i.Namespace == typeof(IRepository).Namespace)
+                where t.GetInterfaces().Any(i => i.IsPublic && i.Namespace == typeof(IRepository).Namespace)
                 let interfaceTargetMethods = from i in t.GetInterfaces()
                                              from im in t.GetInterfaceMap(i).TargetMethods
                                              select im
diff --git a/LibGit2Sharp/ObjectId.cs b/LibGit2Sharp/ObjectId.cs
@@ -8,7 +8,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// Uniquely identifies a <see cref="GitObject"/>.
     /// </summary>
-    public sealed class ObjectId : IEquatable<ObjectId>
+    public sealed class ObjectId : IEquatable<ObjectId>, ICommittish
     {
         private readonly GitOid oid;
         private const int rawSize = 20;
@@ -320,5 +320,7 @@ public bool StartsWith(string shortSha)
 
             return Sha.StartsWith(shortSha, StringComparison.OrdinalIgnoreCase);
         }
+
+        string ICommittish.Identifier { get { return Sha; } }
     }
 }
diff --git a/LibGit2Sharp/Reference.cs b/LibGit2Sharp/Reference.cs
@@ -10,7 +10,7 @@ namespace LibGit2Sharp
     /// A Reference to another git object
     /// </summary>
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    public abstract class Reference : IEquatable<Reference>
+    public abstract class Reference : IEquatable<Reference>, ICommittish
     {
         private static readonly LambdaEqualityHelper<Reference> equalityHelper =
             new LambdaEqualityHelper<Reference>(x => x.CanonicalName, x => x.TargetIdentifier);
@@ -179,5 +179,7 @@ private string DebuggerDisplay
                     "{0} => \"{1}\"", CanonicalName, TargetIdentifier);
             }
         }
+
+        string ICommittish.Identifier { get { return CanonicalName; } }
     }
 }
diff --git a/LibGit2Sharp/RepositoryExtensions.cs b/LibGit2Sharp/RepositoryExtensions.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using LibGit2Sharp.Core;
-using LibGit2Sharp.Handlers;
 
 namespace LibGit2Sharp
 {
@@ -377,24 +376,14 @@ private static ObjectId SingleCommittish(this Repository repo, object identifier
                 return DereferenceToCommit(repo, (string)identifier);
             }
 
-            if (identifier is ObjectId)
-            {
-                return DereferenceToCommit(repo, ((ObjectId)identifier).Sha);
-            }
-
             if (identifier is Commit)
             {
                 return ((Commit)identifier).Id;
             }
 
-            if (identifier is TagAnnotation)
-            {
-                return DereferenceToCommit(repo, ((TagAnnotation)identifier).Target.Id.Sha);
-            }
-
-            if (identifier is Tag)
+            if (identifier is ICommittish)
             {
-                return DereferenceToCommit(repo, ((Tag)identifier).Target.Id.Sha);
+                return DereferenceToCommit(repo, ((ICommittish)identifier).Identifier);
             }
 
             var branch = identifier as Branch;
@@ -407,11 +396,6 @@ private static ObjectId SingleCommittish(this Repository repo, object identifier
                 }
             }
 
-            if (identifier is Reference)
-            {
-                return DereferenceToCommit(repo, ((Reference)identifier).CanonicalName);
-            }
-
             return null;
         }
 
@@ -463,4 +447,9 @@ internal static ObjectId Committish(this Repository repo, object identifier)
             return repo.Committishes(identifier, true).First();
         }
     }
+
+    internal interface ICommittish
+    {
+        string Identifier { get; }
+    }
 }
diff --git a/LibGit2Sharp/Tag.cs b/LibGit2Sharp/Tag.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// A Tag
     /// </summary>
-    public class Tag : ReferenceWrapper<GitObject>
+    public class Tag : ReferenceWrapper<GitObject>, ICommittish
     {
         /// <summary>
         /// Needed for mocking purposes.
@@ -57,5 +57,7 @@ protected override string Shorten()
         {
             return CanonicalName.Substring(Reference.TagPrefix.Length);
         }
+
+        string ICommittish.Identifier { get { return Target.Id.Sha; } }
     }
 }
diff --git a/LibGit2Sharp/TagAnnotation.cs b/LibGit2Sharp/TagAnnotation.cs
@@ -5,7 +5,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// A TagAnnotation
     /// </summary>
-    public class TagAnnotation : GitObject
+    public class TagAnnotation : GitObject, ICommittish
     {
         private readonly GitObjectLazyGroup group;
         private readonly ILazy<GitObject> lazyTarget;
@@ -50,5 +50,7 @@ internal TagAnnotation(Repository repo, ObjectId id)
         /// Gets the tagger.
         /// </summary>
         public virtual Signature Tagger { get { return lazyTagger.Value; } }
+
+        string ICommittish.Identifier { get { return Target.Id.Sha; } }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace LibGit2Sharp`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Uniquely identifies a <see cref="GitObject"/>.`
`10`	`10`	`/// </summary>`
`11`		`- public sealed class ObjectId : IEquatable<ObjectId>`
	`11`	`+ public sealed class ObjectId : IEquatable<ObjectId>, ICommittish`
`12`	`12`	`{`
`13`	`13`	`private readonly GitOid oid;`
`14`	`14`	`private const int rawSize = 20;`
`@@ -320,5 +320,7 @@ public bool StartsWith(string shortSha)`
`320`	`320`
`321`	`321`	`return Sha.StartsWith(shortSha, StringComparison.OrdinalIgnoreCase);`
`322`	`322`	`}`
	`323`	`+`
	`324`	`+ string ICommittish.Identifier { get { return Sha; } }`
`323`	`325`	`}`
`324`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace LibGit2Sharp`
`10`	`10`	`/// A Reference to another git object`
`11`	`11`	`/// </summary>`
`12`	`12`	`[DebuggerDisplay("{DebuggerDisplay,nq}")]`
`13`		`- public abstract class Reference : IEquatable<Reference>`
	`13`	`+ public abstract class Reference : IEquatable<Reference>, ICommittish`
`14`	`14`	`{`
`15`	`15`	`private static readonly LambdaEqualityHelper<Reference> equalityHelper =`
`16`	`16`	`new LambdaEqualityHelper<Reference>(x => x.CanonicalName, x => x.TargetIdentifier);`
`@@ -179,5 +179,7 @@ private string DebuggerDisplay`
`179`	`179`	`"{0} => \"{1}\"", CanonicalName, TargetIdentifier);`
`180`	`180`	`}`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+ string ICommittish.Identifier { get { return CanonicalName; } }`
`182`	`184`	`}`
`183`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using LibGit2Sharp.Core;`
`8`		`-using LibGit2Sharp.Handlers;`
`9`	`8`
`10`	`9`	`namespace LibGit2Sharp`
`11`	`10`	`{`
`@@ -377,24 +376,14 @@ private static ObjectId SingleCommittish(this Repository repo, object identifier`
`377`	`376`	`return DereferenceToCommit(repo, (string)identifier);`
`378`	`377`	`}`
`379`	`378`
`380`		`- if (identifier is ObjectId)`
`381`		`- {`
`382`		`- return DereferenceToCommit(repo, ((ObjectId)identifier).Sha);`
`383`		`- }`
`384`		`-`
`385`	`379`	`if (identifier is Commit)`
`386`	`380`	`{`
`387`	`381`	`return ((Commit)identifier).Id;`
`388`	`382`	`}`
`389`	`383`
`390`		`- if (identifier is TagAnnotation)`
`391`		`- {`
`392`		`- return DereferenceToCommit(repo, ((TagAnnotation)identifier).Target.Id.Sha);`
`393`		`- }`
`394`		`-`
`395`		`- if (identifier is Tag)`
	`384`	`+ if (identifier is ICommittish)`
`396`	`385`	`{`
`397`		`- return DereferenceToCommit(repo, ((Tag)identifier).Target.Id.Sha);`
	`386`	`+ return DereferenceToCommit(repo, ((ICommittish)identifier).Identifier);`
`398`	`387`	`}`
`399`	`388`
`400`	`389`	`var branch = identifier as Branch;`
`@@ -407,11 +396,6 @@ private static ObjectId SingleCommittish(this Repository repo, object identifier`
`407`	`396`	`}`
`408`	`397`	`}`
`409`	`398`
`410`		`- if (identifier is Reference)`
`411`		`- {`
`412`		`- return DereferenceToCommit(repo, ((Reference)identifier).CanonicalName);`
`413`		`- }`
`414`		`-`
`415`	`399`	`return null;`
`416`	`400`	`}`
`417`	`401`
`@@ -463,4 +447,9 @@ internal static ObjectId Committish(this Repository repo, object identifier)`
`463`	`447`	`return repo.Committishes(identifier, true).First();`
`464`	`448`	`}`
`465`	`449`	`}`
	`450`	`+`
	`451`	`+ internal interface ICommittish`
	`452`	`+ {`
	`453`	`+ string Identifier { get; }`
	`454`	`+ }`
`466`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// A Tag`
`5`	`5`	`/// </summary>`
`6`		`- public class Tag : ReferenceWrapper<GitObject>`
	`6`	`+ public class Tag : ReferenceWrapper<GitObject>, ICommittish`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Needed for mocking purposes.`
`@@ -57,5 +57,7 @@ protected override string Shorten()`
`57`	`57`	`{`
`58`	`58`	`return CanonicalName.Substring(Reference.TagPrefix.Length);`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ string ICommittish.Identifier { get { return Target.Id.Sha; } }`
`60`	`62`	`}`
`61`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace LibGit2Sharp`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// A TagAnnotation`
`7`	`7`	`/// </summary>`
`8`		`- public class TagAnnotation : GitObject`
	`8`	`+ public class TagAnnotation : GitObject, ICommittish`
`9`	`9`	`{`
`10`	`10`	`private readonly GitObjectLazyGroup group;`
`11`	`11`	`private readonly ILazy<GitObject> lazyTarget;`
`@@ -50,5 +50,7 @@ internal TagAnnotation(Repository repo, ObjectId id)`
`50`	`50`	`/// Gets the tagger.`
`51`	`51`	`/// </summary>`
`52`	`52`	`public virtual Signature Tagger { get { return lazyTagger.Value; } }`
	`53`	`+`
	`54`	`+ string ICommittish.Identifier { get { return Target.Id.Sha; } }`
`53`	`55`	`}`
`54`	`56`	`}`