Let users create our types

carlosmn · carlosmn · commit 3109b5f68185 · 2016-03-08T10:32:40.000+01:00
Instead of hiding everything but making it virtual for mocking, let the
users create their own objects with the data they want.
diff --git a/LibGit2Sharp/CherryPickResult.cs b/LibGit2Sharp/CherryPickResult.cs
@@ -5,12 +5,6 @@
     /// </summary>
     public class CherryPickResult
     {
-        internal CherryPickResult(CherryPickStatus status, Commit commit = null)
-        {
-            Commit = commit;
-            Status = status;
-        }
-
         /// <summary>
         /// The resulting commit of the cherry pick.
         /// <para>
@@ -20,12 +14,12 @@ internal CherryPickResult(CherryPickStatus status, Commit commit = null)
         ///       2) The option to not commit on success is set.
         ///   </para>
         /// </summary>
-        public virtual Commit Commit { get; private set; }
+        public virtual Commit Commit { get; set; }
 
         /// <summary>
         /// The status of the cherry pick.
         /// </summary>
-        public virtual CherryPickStatus Status { get; private set; }
+        public virtual CherryPickStatus Status { get; set; }
     }
 
     /// <summary>
diff --git a/LibGit2Sharp/Configuration.cs b/LibGit2Sharp/Configuration.cs
@@ -700,9 +700,12 @@ private static ConfigurationEntry<string> BuildConfigEntry(IntPtr entryPtr)
         {
             var entry = entryPtr.MarshalAs<GitConfigEntry>();
 
-            return new ConfigurationEntry<string>(LaxUtf8Marshaler.FromNative(entry.namePtr),
-                                                  LaxUtf8Marshaler.FromNative(entry.valuePtr),
-                                                  (ConfigurationLevel)entry.level);
+            return new ConfigurationEntry<string>
+            {
+                Key = LaxUtf8Marshaler.FromNative(entry.namePtr),
+                Value = LaxUtf8Marshaler.FromNative(entry.valuePtr),
+                Level = (ConfigurationLevel)entry.level,
+            };
         }
 
         /// <summary>
diff --git a/LibGit2Sharp/ConfigurationEntry.cs b/LibGit2Sharp/ConfigurationEntry.cs
@@ -13,30 +13,17 @@ public class ConfigurationEntry<T>
         /// <summary>
         /// The fully-qualified option name.
         /// </summary>
-        public virtual string Key { get; private set; }
+        public virtual string Key { get; set; }
 
         /// <summary>
         /// The option value.
         /// </summary>
-        public virtual T Value { get; private set; }
+        public virtual T Value { get; set; }
 
         /// <summary>
         /// The origin store.
         /// </summary>
-        public virtual ConfigurationLevel Level { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigurationEntry{T}"/> class with a given key and value
-        /// </summary>
-        /// <param name="key">The option name</param>
-        /// <param name="value">The option value</param>
-        /// <param name="level">The origin store</param>
-        protected internal ConfigurationEntry(string key, T value, ConfigurationLevel level)
-        {
-            Key = key;
-            Value = value;
-            Level = level;
-        }
+        public virtual ConfigurationLevel Level { get; set; }
 
         private string DebuggerDisplay
         {
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -506,9 +506,12 @@ public static ConfigurationEntry<T> git_config_get_entry<T>(ConfigurationSafeHan
                 handle.SafeDispose();
             }
 
-            return new ConfigurationEntry<T>(LaxUtf8Marshaler.FromNative(entry.namePtr),
-                                             (T)configurationParser[typeof(T)](LaxUtf8Marshaler.FromNative(entry.valuePtr)),
-                                             (ConfigurationLevel)entry.level);
+            return new ConfigurationEntry<T>
+            {
+                Key = LaxUtf8Marshaler.FromNative(entry.namePtr),
+                Value = (T)configurationParser[typeof(T)](LaxUtf8Marshaler.FromNative(entry.valuePtr)),
+                Level = (ConfigurationLevel)entry.level,
+            };
         }
 
         public static ConfigurationSafeHandle git_config_new()
diff --git a/LibGit2Sharp/FilterAttributeEntry.cs b/LibGit2Sharp/FilterAttributeEntry.cs
@@ -16,11 +16,6 @@ public class FilterAttributeEntry
 
         private readonly string filterDefinition;
 
-        /// <summary>
-        /// For testing purposes
-        /// </summary>
-        protected FilterAttributeEntry() { }
-
         /// <summary>
         /// The name of the filter found in a .gitattributes file.
         /// </summary>
diff --git a/LibGit2Sharp/IndexEntry.cs b/LibGit2Sharp/IndexEntry.cs
@@ -18,22 +18,22 @@ public class IndexEntry : IEquatable<IndexEntry>
         /// <summary>
         /// Gets the relative path to the file within the working directory.
         /// </summary>
-        public virtual string Path { get; private set; }
+        public virtual string Path { get; set; }
 
         /// <summary>
         /// Gets the file mode.
         /// </summary>
-        public virtual Mode Mode { get; private set; }
+        public virtual Mode Mode { get; set; }
 
         /// <summary>
         /// Gets the stage number.
         /// </summary>
-        public virtual StageLevel StageLevel { get; private set; }
+        public virtual StageLevel StageLevel { get; set; }
 
         /// <summary>
         /// Whether the file is marked as assume-unchanged
         /// </summary>
-        public virtual bool AssumeUnchanged { get; private set; }
+        public virtual bool AssumeUnchanged { get; set; }
 
         /// <summary>
         /// Gets the id of the <see cref="Blob"/> pointed at by this index entry.
diff --git a/LibGit2Sharp/IndexNameEntry.cs b/LibGit2Sharp/IndexNameEntry.cs
@@ -46,17 +46,17 @@ internal static IndexNameEntry BuildFromPtr(IndexNameEntrySafeHandle handle)
         /// <summary>
         /// Gets the path of the ancestor side of the conflict.
         /// </summary>
-        public virtual string Ancestor { get; private set; }
+        public virtual string Ancestor { get; set; }
 
         /// <summary>
         /// Gets the path of the "ours" side of the conflict.
         /// </summary>
-        public virtual string Ours { get; private set; }
+        public virtual string Ours { get; set; }
 
         /// <summary>
         /// Gets the path of the "theirs" side of the conflict.
         /// </summary>
-        public virtual string Theirs { get; private set; }
+        public virtual string Theirs { get; set; }
 
         /// <summary>
         /// Determines whether the specified <see cref="Object"/> is equal to the current <see cref="IndexNameEntry"/>.
diff --git a/LibGit2Sharp/IndexReucEntry.cs b/LibGit2Sharp/IndexReucEntry.cs
@@ -45,43 +45,43 @@ internal static IndexReucEntry BuildFromPtr(IndexReucEntrySafeHandle handle)
         /// <summary>
         /// Gets the path of this conflict.
         /// </summary>
-        public virtual string Path { get; private set; }
+        public virtual string Path { get; set; }
 
         /// <summary>
         /// Gets the <see cref="ObjectId"/> that was the ancestor of this
         /// conflict.
         /// </summary>
-        public virtual ObjectId AncestorId { get; private set; }
+        public virtual ObjectId AncestorId { get; set; }
 
         /// <summary>
         /// Gets the <see cref="Mode"/> of the file that was the ancestor of
         /// conflict.
         /// </summary>
-        public virtual Mode AncestorMode { get; private set; }
+        public virtual Mode AncestorMode { get; set; }
 
         /// <summary>
         /// Gets the <see cref="ObjectId"/> that was "our" side of this
         /// conflict.
         /// </summary>
-        public virtual ObjectId OurId { get; private set; }
+        public virtual ObjectId OurId { get; set; }
 
         /// <summary>
         /// Gets the <see cref="Mode"/> of the file that was "our" side of
         /// the conflict.
         /// </summary>
-        public virtual Mode OurMode { get; private set; }
+        public virtual Mode OurMode { get; set; }
 
         /// <summary>
         /// Gets the <see cref="ObjectId"/> that was "their" side of this
         /// conflict.
         /// </summary>
-        public virtual ObjectId TheirId { get; private set; }
+        public virtual ObjectId TheirId { get; set; }
 
         /// <summary>
         /// Gets the <see cref="Mode"/> of the file that was "their" side of
         /// the conflict.
         /// </summary>
-        public virtual Mode TheirMode { get; private set; }
+        public virtual Mode TheirMode { get; set; }
 
         /// <summary>
         /// Determines whether the specified <see cref="Object"/> is equal to the current <see cref="IndexReucEntry"/>.
diff --git a/LibGit2Sharp/LogEntry.cs b/LibGit2Sharp/LogEntry.cs
@@ -8,11 +8,11 @@ public sealed class LogEntry
         /// <summary>
         /// The file's path relative to the repository's root.
         /// </summary>
-        public string Path { get; internal set; }
+        public string Path { get; set; }
 
         /// <summary>
         /// The commit in which the file was created or changed.
         /// </summary>
-        public Commit Commit { get; internal set; }
+        public Commit Commit { get; set; }
     }
 }
diff --git a/LibGit2Sharp/MergeResult.cs b/LibGit2Sharp/MergeResult.cs
@@ -5,31 +5,17 @@
     /// </summary>
     public class MergeResult
     {
-        internal MergeResult(MergeStatus status, Commit commit = null)
-        {
-            this.Status = status;
-            this.Commit = commit;
-        }
-
         /// <summary>
         /// The status of the merge.
         /// </summary>
-        public virtual MergeStatus Status
-        {
-            get;
-            private set;
-        }
+        public virtual MergeStatus Status { get; set; }
 
         /// <summary>
         /// The resulting commit of the merge. For fast-forward merges, this is the
         /// commit that merge was fast forwarded to.
         /// <para>This will return <code>null</code> if the merge has been unsuccessful due to conflicts.</para>
         /// </summary>
-        public virtual Commit Commit
-        {
-            get;
-            private set;
-        }
+        public virtual Commit Commit { get; set; }
     }
 
     /// <summary>
diff --git a/LibGit2Sharp/MergeTreeResult.cs b/LibGit2Sharp/MergeTreeResult.cs
@@ -7,13 +7,21 @@ namespace LibGit2Sharp
     /// </summary>
     public class MergeTreeResult
     {
-        internal MergeTreeResult(IEnumerable<Conflict> conflicts)
+        /// <summary>
+        /// Create a <see cref="LibGit2Sharp.MergeTreeResult"/> which resulted in conflicts
+        /// </summary>
+        /// <param name="conflicts">The list of conflicts from the merge</param>
+        public MergeTreeResult(IEnumerable<Conflict> conflicts)
         {
             this.Status = MergeTreeStatus.Conflicts;
             this.Conflicts = conflicts;
         }
 
-        internal MergeTreeResult(Tree tree)
+        /// <summary>
+        /// Create a <see cref="LibGit2Sharp.MergeTreeResult"/> from a successful merge
+        /// </summary>
+        /// <param name="tree">The resulting tree</param>
+        public MergeTreeResult(Tree tree)
         {
             this.Status = MergeTreeStatus.Succeeded;
             this.Tree = tree;
diff --git a/LibGit2Sharp/PushResult.cs b/LibGit2Sharp/PushResult.cs
@@ -24,7 +24,10 @@ public virtual bool HasErrors
             get { return failedPushUpdates.Count > 0; }
         }
 
-        internal PushResult(List<PushStatusError> failedPushUpdates)
+        /// <summary>
+        /// <see cref="PushStatusError"/>s that failed to update.
+        /// </summary>
+        public PushResult(List<PushStatusError> failedPushUpdates)
         {
             this.failedPushUpdates = failedPushUpdates ?? new List<PushStatusError>();
         }
diff --git a/LibGit2Sharp/RebaseOperationImpl.cs b/LibGit2Sharp/RebaseOperationImpl.cs
@@ -56,11 +56,12 @@ private static RebaseResult CompleteRebase(RebaseSafeHandle rebaseOperationHandl
 
             // Rebase is completed!
             Proxy.git_rebase_finish(rebaseOperationHandle, committer);
-            var rebaseResult = new RebaseResult(RebaseStatus.Complete,
-                                            totalStepCount,
-                                            totalStepCount,
-                                            null);
-            return rebaseResult;
+            return new RebaseResult
+            {
+                Status = RebaseStatus.Complete,
+                CompletedStepCount = totalStepCount,
+                TotalStepCount = totalStepCount,
+            };
         }
 
         /// <summary>
@@ -144,10 +145,12 @@ private static RebaseResult RunRebaseStep(RebaseSafeHandle rebaseOperationHandle
             // running the rebase sequence operations, then report the result.
             if (rebaseStepResult.Status == RebaseStepStatus.Conflicts)
             {
-                rebaseSequenceResult = new RebaseResult(RebaseStatus.Conflicts,
-                                                        stepToApplyIndex,
-                                                        totalStepCount,
-                                                        null);
+                rebaseSequenceResult = new RebaseResult
+                {
+                    Status = RebaseStatus.Conflicts,
+                    CompletedStepCount = stepToApplyIndex,
+                    TotalStepCount = totalStepCount,
+                };
             }
 
             return rebaseSequenceResult;
diff --git a/LibGit2Sharp/RebaseResult.cs b/LibGit2Sharp/RebaseResult.cs
@@ -32,39 +32,28 @@ public enum RebaseStatus
     /// </summary>
     public class RebaseResult
     {
-        internal RebaseResult(RebaseStatus status,
-                              long stepNumber,
-                              long totalSteps,
-                              RebaseStepInfo currentStepInfo)
-        {
-            Status = status;
-            CompletedStepCount = stepNumber;
-            TotalStepCount = totalSteps;
-            CurrentStepInfo = currentStepInfo;
-        }
-
         /// <summary>
         /// Information on the operation to be performed in the current step.
         /// If the overall Rebase operation has completed successfully, this will
         /// be null.
         /// </summary>
-        public virtual RebaseStepInfo CurrentStepInfo { get; private set; }
+        public virtual RebaseStepInfo CurrentStepInfo { get; set; }
 
         /// <summary>
         /// Did the rebase operation run until it should stop
         /// (completed the rebase, or the operation for the current step
         /// is one that sequencing should stop.
         /// </summary>
-        public virtual RebaseStatus Status { get; protected set; }
+        public virtual RebaseStatus Status { get; set; }
 
         /// <summary>
         /// The number of completed steps.
         /// </summary>
-        public virtual long CompletedStepCount { get; protected set; }
+        public virtual long CompletedStepCount { get; set; }
 
         /// <summary>
         /// The total number of steps in the rebase.
         /// </summary>
-        public virtual long TotalStepCount { get; protected set; }
+        public virtual long TotalStepCount { get; set; }
     }
 }
diff --git a/LibGit2Sharp/ReflogEntry.cs b/LibGit2Sharp/ReflogEntry.cs
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
diff --git a/LibGit2Sharp/RepositoryStatus.cs b/LibGit2Sharp/RepositoryStatus.cs
diff --git a/LibGit2Sharp/RevertResult.cs b/LibGit2Sharp/RevertResult.cs
diff --git a/LibGit2Sharp/StatusEntry.cs b/LibGit2Sharp/StatusEntry.cs
diff --git a/LibGit2Sharp/TreeEntry.cs b/LibGit2Sharp/TreeEntry.cs

Original file line number	Diff line number	Diff line change
`@@ -700,9 +700,12 @@ private static ConfigurationEntry<string> BuildConfigEntry(IntPtr entryPtr)`
`700`	`700`	`{`
`701`	`701`	`var entry = entryPtr.MarshalAs<GitConfigEntry>();`
`702`	`702`
`703`		`- return new ConfigurationEntry<string>(LaxUtf8Marshaler.FromNative(entry.namePtr),`
`704`		`- LaxUtf8Marshaler.FromNative(entry.valuePtr),`
`705`		`- (ConfigurationLevel)entry.level);`
	`703`	`+ return new ConfigurationEntry<string>`
	`704`	`+ {`
	`705`	`+ Key = LaxUtf8Marshaler.FromNative(entry.namePtr),`
	`706`	`+ Value = LaxUtf8Marshaler.FromNative(entry.valuePtr),`
	`707`	`+ Level = (ConfigurationLevel)entry.level,`
	`708`	`+ };`
`706`	`709`	`}`
`707`	`710`
`708`	`711`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -506,9 +506,12 @@ public static ConfigurationEntry<T> git_config_get_entry<T>(ConfigurationSafeHan`
`506`	`506`	`handle.SafeDispose();`
`507`	`507`	`}`
`508`	`508`
`509`		`- return new ConfigurationEntry<T>(LaxUtf8Marshaler.FromNative(entry.namePtr),`
`510`		`- (T)configurationParser[typeof(T)](LaxUtf8Marshaler.FromNative(entry.valuePtr)),`
`511`		`- (ConfigurationLevel)entry.level);`
	`509`	`+ return new ConfigurationEntry<T>`
	`510`	`+ {`
	`511`	`+ Key = LaxUtf8Marshaler.FromNative(entry.namePtr),`
	`512`	`+ Value = (T)configurationParser[typeof(T)](LaxUtf8Marshaler.FromNative(entry.valuePtr)),`
	`513`	`+ Level = (ConfigurationLevel)entry.level,`
	`514`	`+ };`
`512`	`515`	`}`
`513`	`516`
`514`	`517`	`public static ConfigurationSafeHandle git_config_new()`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ public sealed class LogEntry`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// The file's path relative to the repository's root.`
`10`	`10`	`/// </summary>`
`11`		`- public string Path { get; internal set; }`
	`11`	`+ public string Path { get; set; }`
`12`	`12`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// The commit in which the file was created or changed.`
`15`	`15`	`/// </summary>`
`16`		`- public Commit Commit { get; internal set; }`
	`16`	`+ public Commit Commit { get; set; }`
`17`	`17`	`}`
`18`	`18`	`}`