Remove CultureInfo parameter from LibGit2sharpException ctor and use always InvariantCulture

Oded Welgreen · Oded Welgreen · commit 7dd95b8be3c8 · 2015-10-20T16:14:58.000+03:00
diff --git a/LibGit2Sharp/AmbiguousSpecificationException.cs b/LibGit2Sharp/AmbiguousSpecificationException.cs
@@ -27,11 +27,10 @@ public AmbiguousSpecificationException(string message)
         /// <summary>
         /// Initializes a new instance of the <see cref="AmbiguousSpecificationException"/> class with a specified error message.
         /// </summary>
-        /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>
         /// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>
         /// <param name="args">An object array that contains zero or more objects to format.</param>
-        public AmbiguousSpecificationException(CultureInfo cultureInfo, string format, params object[] args)
-            : base(String.Format(cultureInfo, format, args))
+        public AmbiguousSpecificationException(string format, params object[] args)
+            : base(String.Format(format, args))
         {
         }
 
diff --git a/LibGit2Sharp/BranchCollection.cs b/LibGit2Sharp/BranchCollection.cs
@@ -263,8 +263,7 @@ public virtual Branch Rename(Branch branch, string newName, bool allowOverwrite)
 
             if (branch.IsRemote)
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                "Cannot rename branch '{0}'. It's a remote tracking branch.",
+                throw new LibGit2SharpException("Cannot rename branch '{0}'. It's a remote tracking branch.",
                                                 branch.FriendlyName);
             }
 
diff --git a/LibGit2Sharp/Configuration.cs b/LibGit2Sharp/Configuration.cs
@@ -693,8 +693,7 @@ private ConfigurationSafeHandle RetrieveConfigurationHandle(ConfigurationLevel l
 
             if (handle == null && throwIfStoreHasNotBeenFound)
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                              "No {0} configuration file has been found.",
+                throw new LibGit2SharpException("No {0} configuration file has been found.",
                                                               Enum.GetName(typeof(ConfigurationLevel), level));
             }
 
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -1432,9 +1432,8 @@ public static IntPtr git_odb_backend_malloc(IntPtr backend, UIntPtr len)
 
             if (IntPtr.Zero == toReturn)
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                              "Unable to allocate {0} bytes; out of memory",
-                                                              len,
+                throw new LibGit2SharpException("Unable to allocate {0} bytes; out of memory",
+                                                len,
                                                 GitErrorCode.Error,
                                                 GitErrorCategory.NoMemory);
             }
@@ -2556,8 +2555,7 @@ public static Tuple<GitObjectSafeHandle, ReferenceSafeHandle> git_revparse_ext(R
                     return null;
 
                 case (int)GitErrorCode.Ambiguous:
-                    throw new AmbiguousSpecificationException(CultureInfo.InvariantCulture,
-                                                              "Provided abbreviated ObjectId '{0}' is too short.",
+                    throw new AmbiguousSpecificationException("Provided abbreviated ObjectId '{0}' is too short.",
                                                               objectish);
 
                 default:
@@ -2778,8 +2776,7 @@ public static FileStatus git_status_file(RepositorySafeHandle repo, FilePath pat
                     return FileStatus.Nonexistent;
 
                 case (int)GitErrorCode.Ambiguous:
-                    throw new AmbiguousSpecificationException(CultureInfo.InvariantCulture,
-                                                              "More than one file matches the pathspec '{0}'. " +
+                    throw new AmbiguousSpecificationException("More than one file matches the pathspec '{0}'. " +
                                                               "You can either force a literal path evaluation " +
                                                               "(GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH), or use git_status_foreach().",
                                                               path);
diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
@@ -109,8 +109,7 @@ private static T BuildDiffResult<T>(DiffSafeHandle diff) where T : class, IDiffR
 
             if (!ChangesBuilders.TryGetValue(typeof(T), out builder))
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                    "User-defined types passed to Compare are not supported. Supported values are: {0}",
+                throw new LibGit2SharpException("User-defined types passed to Compare are not supported. Supported values are: {0}",
                     string.Join(", ", ChangesBuilders.Keys.Select(x => x.Name)));
             }
 
diff --git a/LibGit2Sharp/GitObject.cs b/LibGit2Sharp/GitObject.cs
@@ -77,8 +77,7 @@ internal static GitObject BuildFrom(Repository repo, ObjectId id, GitObjectType
                     return new Blob(repo, id);
 
                 default:
-                    throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                    "Unexpected type '{0}' for object '{1}'.",
+                    throw new LibGit2SharpException("Unexpected type '{0}' for object '{1}'.",
                                                     type,
                                                     id);
             }
diff --git a/LibGit2Sharp/LibGit2SharpException.cs b/LibGit2Sharp/LibGit2SharpException.cs
@@ -37,11 +37,10 @@ public LibGit2SharpException(string message, Exception innerException)
         /// <summary>
         /// Initializes a new instance of the <see cref="LibGit2SharpException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
         /// </summary>
-        /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>
         /// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>
         /// <param name="args">An object array that contains zero or more objects to format.</param>
-        public LibGit2SharpException(CultureInfo cultureInfo, string format, params object[] args)
-            : base(String.Format(cultureInfo, format, args))
+        public LibGit2SharpException(string format, params object[] args)
+            : base(String.Format(CultureInfo.InvariantCulture, format, args))
         {
         }
 
diff --git a/LibGit2Sharp/Network.cs b/LibGit2Sharp/Network.cs
@@ -399,9 +399,7 @@ public virtual void Push(
             {
                 if (string.IsNullOrEmpty(branch.UpstreamBranchCanonicalName))
                 {
-                    throw new LibGit2SharpException(
-                            CultureInfo.InvariantCulture,
-                            "The branch '{0}' (\"{1}\") that you are trying to push does not track an upstream branch.",
+                    throw new LibGit2SharpException("The branch '{0}' (\"{1}\") that you are trying to push does not track an upstream branch.",
                             branch.FriendlyName, branch.CanonicalName);
                 }
             }
diff --git a/LibGit2Sharp/Rebase.cs b/LibGit2Sharp/Rebase.cs
@@ -81,8 +81,7 @@ public virtual RebaseResult Start(Branch branch, Branch upstream, Branch onto, I
 
             if (this.repository.Info.CurrentOperation != CurrentOperation.None)
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                    "A {0} operation is already in progress.", 
+                throw new LibGit2SharpException("A {0} operation is already in progress.", 
                     this.repository.Info.CurrentOperation);
             }
 
diff --git a/LibGit2Sharp/RebaseOperationImpl.cs b/LibGit2Sharp/RebaseOperationImpl.cs
@@ -119,8 +119,7 @@ private static RebaseResult RunRebaseStep(RebaseSafeHandle rebaseOperationHandle
                 case RebaseStepOperation.Fixup:
                 case RebaseStepOperation.Reword:
                     // These operations are not yet supported by lg2.
-                    throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                        "Rebase Operation Type ({0}) is not currently supported in LibGit2Sharp.",
+                    throw new LibGit2SharpException("Rebase Operation Type ({0}) is not currently supported in LibGit2Sharp.",
                         stepToApplyInfo.Type);
                 default:
                     throw new ArgumentException(string.Format(
diff --git a/LibGit2Sharp/Reference.cs b/LibGit2Sharp/Reference.cs
@@ -59,7 +59,7 @@ internal static T BuildFromPtr<T>(ReferenceSafeHandle handle, Repository repo) w
                     break;
 
                 default:
-                    throw new LibGit2SharpException(CultureInfo.InvariantCulture, "Unable to build a new reference from a type '{0}'.", type);
+                    throw new LibGit2SharpException("Unable to build a new reference from a type '{0}'.", type);
             }
 
             return reference as T;
diff --git a/LibGit2Sharp/ReferenceCollection.cs b/LibGit2Sharp/ReferenceCollection.cs
@@ -404,9 +404,7 @@ public virtual Reference Rename(string currentName, string newName,
 
             if (reference == null)
             {
-                throw new LibGit2SharpException(
-                    CultureInfo.InvariantCulture,
-                    "Reference '{0}' doesn't exist. One cannot move a non existing reference.", 
+                throw new LibGit2SharpException("Reference '{0}' doesn't exist. One cannot move a non existing reference.", 
                     currentName);
             }
 
@@ -547,8 +545,7 @@ public virtual Reference UpdateTarget(string name, string canonicalRefNameOrObje
                 return UpdateTarget(symbolicReference, targetRef, logMessage);
             }
 
-            throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                            "Reference '{0}' has an unexpected type ('{1}').",
+            throw new LibGit2SharpException("Reference '{0}' has an unexpected type ('{1}').",
                                             name,
                                             reference.GetType());
         }
diff --git a/LibGit2Sharp/RemoveFromIndexException.cs b/LibGit2Sharp/RemoveFromIndexException.cs
@@ -27,11 +27,10 @@ public RemoveFromIndexException(string message)
         /// <summary>
         /// Initializes a new instance of the <see cref="LibGit2SharpException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
         /// </summary>
-        /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>
         /// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>
         /// <param name="args">An object array that contains zero or more objects to format.</param>
-        public RemoveFromIndexException(CultureInfo cultureInfo, string format, params object[] args)
-            : base(cultureInfo, format, args)
+        public RemoveFromIndexException(string format, params object[] args)
+            : base(format, args)
         {
         }
 
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -900,8 +900,7 @@ public Branch Checkout(Branch branch, CheckoutOptions options)
             // Make sure this is not an unborn branch.
             if (branch.Tip == null)
             {
-                throw new UnbornBranchException(CultureInfo.InvariantCulture,
-                                                "The tip of branch '{0}' is null. There's nothing to checkout.",
+                throw new UnbornBranchException("The tip of branch '{0}' is null. There's nothing to checkout.",
                                                 branch.FriendlyName);
             }
 
@@ -1858,8 +1857,7 @@ public void Move(IEnumerable<string> sourcePaths, IEnumerable<string> destinatio
                 FileStatus sourceStatus = keyValuePair.Key.Item2;
                 if (sourceStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.DeletedFromIndex, FileStatus.NewInWorkdir, FileStatus.DeletedFromWorkdir }))
                 {
-                    throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                    "Unable to move file '{0}'. Its current status is '{1}'.",
+                    throw new LibGit2SharpException("Unable to move file '{0}'. Its current status is '{1}'.",
                                                     sourcePath,
                                                     sourceStatus);
                 }
@@ -1870,8 +1868,7 @@ public void Move(IEnumerable<string> sourcePaths, IEnumerable<string> destinatio
                     continue;
                 }
 
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture,
-                                                "Unable to overwrite file '{0}'. Its current status is '{1}'.",
+                throw new LibGit2SharpException("Unable to overwrite file '{0}'. Its current status is '{1}'.",
                                                 destPath,
                                                 desStatus);
             }
@@ -2106,8 +2103,7 @@ private IEnumerable<string> RemoveStagedItems(IEnumerable<string> paths, bool re
                             status.HasFlag(FileStatus.ModifiedInIndex) ||
                             status.HasFlag(FileStatus.NewInIndex)))
                         {
-                            throw new RemoveFromIndexException(CultureInfo.InvariantCulture,
-                                                               "Unable to remove file '{0}', as it has changes staged in the index. You can call the Remove() method with removeFromWorkingDirectory=false if you want to remove it from the index only.",
+                            throw new RemoveFromIndexException("Unable to remove file '{0}', as it has changes staged in the index. You can call the Remove() method with removeFromWorkingDirectory=false if you want to remove it from the index only.",
                                                                treeEntryChanges.Path);
                         }
                         removed.Add(RemoveFromIndex(treeEntryChanges.Path));
@@ -2116,22 +2112,19 @@ private IEnumerable<string> RemoveStagedItems(IEnumerable<string> paths, bool re
                     case ChangeKind.Modified:
                         if (status.HasFlag(FileStatus.ModifiedInWorkdir) && status.HasFlag(FileStatus.ModifiedInIndex))
                         {
-                            throw new RemoveFromIndexException(CultureInfo.InvariantCulture,
-                                                               "Unable to remove file '{0}', as it has staged content different from both the working directory and the HEAD.",
+                            throw new RemoveFromIndexException("Unable to remove file '{0}', as it has staged content different from both the working directory and the HEAD.",
                                                                treeEntryChanges.Path);
                         }
                         if (removeFromWorkingDirectory)
                         {
-                            throw new RemoveFromIndexException(CultureInfo.InvariantCulture,
-                                                               "Unable to remove file '{0}', as it has local modifications. You can call the Remove() method with removeFromWorkingDirectory=false if you want to remove it from the index only.",
+                            throw new RemoveFromIndexException("Unable to remove file '{0}', as it has local modifications. You can call the Remove() method with removeFromWorkingDirectory=false if you want to remove it from the index only.",
                                                                treeEntryChanges.Path);
                         }
                         removed.Add(RemoveFromIndex(treeEntryChanges.Path));
                         continue;
 
                     default:
-                        throw new RemoveFromIndexException(CultureInfo.InvariantCulture,
-                                                           "Unable to remove file '{0}'. Its current status is '{1}'.",
+                        throw new RemoveFromIndexException("Unable to remove file '{0}'. Its current status is '{1}'.",
                                                            treeEntryChanges.Path,
                                                            treeEntryChanges.Status);
                 }
diff --git a/LibGit2Sharp/RepositoryExtensions.cs b/LibGit2Sharp/RepositoryExtensions.cs
@@ -485,7 +485,7 @@ internal static IEnumerable<ObjectId> Committishes(this Repository repo, object
 
             if (throwIfNotFound)
             {
-                throw new LibGit2SharpException(CultureInfo.InvariantCulture, "Unexpected kind of identifier '{0}'.", identifier);
+                throw new LibGit2SharpException("Unexpected kind of identifier '{0}'.", identifier);
             }
 
             yield return null;
diff --git a/LibGit2Sharp/SubmoduleCollection.cs b/LibGit2Sharp/SubmoduleCollection.cs
@@ -160,7 +160,7 @@ internal T Lookup<T>(string name, Func<SubmoduleSafeHandle, T> selector, bool th
 
                 if (throwIfNotFound)
                 {
-                    throw new LibGit2SharpException(CultureInfo.InvariantCulture, "Submodule lookup failed for '{0}'.", name);
+                    throw new LibGit2SharpException("Submodule lookup failed for '{0}'.", name);
                 }
 
                 return default(T);
diff --git a/LibGit2Sharp/UnbornBranchException.cs b/LibGit2Sharp/UnbornBranchException.cs
@@ -28,11 +28,10 @@ public UnbornBranchException(string message)
         /// <summary>
         /// Initializes a new instance of the <see cref="UnbornBranchException"/> class with a specified error message.
         /// </summary>
-        /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>
         /// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>
         /// <param name="args">An object array that contains zero or more objects to format.</param>
-        public UnbornBranchException(CultureInfo cultureInfo, string format, params object[] args)
-            : base(cultureInfo, format, args)
+        public UnbornBranchException(string format, params object[] args)
+            : base(format, args)
         { }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,10 @@ public AmbiguousSpecificationException(string message)`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Initializes a new instance of the <see cref="AmbiguousSpecificationException"/> class with a specified error message.`
`29`	`29`	`/// </summary>`
`30`		`- /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>`
`31`	`30`	`/// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>`
`32`	`31`	`/// <param name="args">An object array that contains zero or more objects to format.</param>`
`33`		`- public AmbiguousSpecificationException(CultureInfo cultureInfo, string format, params object[] args)`
`34`		`- : base(String.Format(cultureInfo, format, args))`
	`32`	`+ public AmbiguousSpecificationException(string format, params object[] args)`
	`33`	`+ : base(String.Format(format, args))`
`35`	`34`	`{`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -263,8 +263,7 @@ public virtual Branch Rename(Branch branch, string newName, bool allowOverwrite)`
`263`	`263`
`264`	`264`	`if (branch.IsRemote)`
`265`	`265`	`{`
`266`		`- throw new LibGit2SharpException(CultureInfo.InvariantCulture,`
`267`		`- "Cannot rename branch '{0}'. It's a remote tracking branch.",`
	`266`	`+ throw new LibGit2SharpException("Cannot rename branch '{0}'. It's a remote tracking branch.",`
`268`	`267`	`branch.FriendlyName);`
`269`	`268`	`}`
`270`	`269`
Original file line number	Diff line number	Diff line change
`@@ -693,8 +693,7 @@ private ConfigurationSafeHandle RetrieveConfigurationHandle(ConfigurationLevel l`
`693`	`693`
`694`	`694`	`if (handle == null && throwIfStoreHasNotBeenFound)`
`695`	`695`	`{`
`696`		`- throw new LibGit2SharpException(CultureInfo.InvariantCulture,`
`697`		`- "No {0} configuration file has been found.",`
	`696`	`+ throw new LibGit2SharpException("No {0} configuration file has been found.",`
`698`	`697`	`Enum.GetName(typeof(ConfigurationLevel), level));`
`699`	`698`	`}`
`700`	`699`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,7 @@ private static T BuildDiffResult<T>(DiffSafeHandle diff) where T : class, IDiffR`
`109`	`109`
`110`	`110`	`if (!ChangesBuilders.TryGetValue(typeof(T), out builder))`
`111`	`111`	`{`
`112`		`- throw new LibGit2SharpException(CultureInfo.InvariantCulture,`
`113`		`- "User-defined types passed to Compare are not supported. Supported values are: {0}",`
	`112`	`+ throw new LibGit2SharpException("User-defined types passed to Compare are not supported. Supported values are: {0}",`
`114`	`113`	`string.Join(", ", ChangesBuilders.Keys.Select(x => x.Name)));`
`115`	`114`	`}`
`116`	`115`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ internal static GitObject BuildFrom(Repository repo, ObjectId id, GitObjectType`
`77`	`77`	`return new Blob(repo, id);`
`78`	`78`
`79`	`79`	`default:`
`80`		`- throw new LibGit2SharpException(CultureInfo.InvariantCulture,`
`81`		`- "Unexpected type '{0}' for object '{1}'.",`
	`80`	`+ throw new LibGit2SharpException("Unexpected type '{0}' for object '{1}'.",`
`82`	`81`	`type,`
`83`	`82`	`id);`
`84`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,10 @@ public LibGit2SharpException(string message, Exception innerException)`
`37`	`37`	`/// <summary>`
`38`	`38`	`/// Initializes a new instance of the <see cref="LibGit2SharpException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.`
`39`	`39`	`/// </summary>`
`40`		`- /// <param name="cultureInfo">An object that supplies culture-specific formatting information.</param>`
`41`	`40`	`/// <param name="format">A composite format string for use in <see cref="String.Format(IFormatProvider, string, object[])"/>.</param>`
`42`	`41`	`/// <param name="args">An object array that contains zero or more objects to format.</param>`
`43`		`- public LibGit2SharpException(CultureInfo cultureInfo, string format, params object[] args)`
`44`		`- : base(String.Format(cultureInfo, format, args))`
	`42`	`+ public LibGit2SharpException(string format, params object[] args)`
	`43`	`+ : base(String.Format(CultureInfo.InvariantCulture, format, args))`
`45`	`44`	`{`
`46`	`45`	`}`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -399,9 +399,7 @@ public virtual void Push(`
`399`	`399`	`{`
`400`	`400`	`if (string.IsNullOrEmpty(branch.UpstreamBranchCanonicalName))`
`401`	`401`	`{`
`402`		`- throw new LibGit2SharpException(`
`403`		`- CultureInfo.InvariantCulture,`
`404`		`- "The branch '{0}' (\"{1}\") that you are trying to push does not track an upstream branch.",`
	`402`	`+ throw new LibGit2SharpException("The branch '{0}' (\"{1}\") that you are trying to push does not track an upstream branch.",`
`405`	`403`	`branch.FriendlyName, branch.CanonicalName);`
`406`	`404`	`}`
`407`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@ public virtual RebaseResult Start(Branch branch, Branch upstream, Branch onto, I`
`81`	`81`
`82`	`82`	`if (this.repository.Info.CurrentOperation != CurrentOperation.None)`
`83`	`83`	`{`
`84`		`- throw new LibGit2SharpException(CultureInfo.InvariantCulture,`
`85`		`- "A {0} operation is already in progress.",`
	`84`	`+ throw new LibGit2SharpException("A {0} operation is already in progress.",`
`86`	`85`	`this.repository.Info.CurrentOperation);`
`87`	`86`	`}`
`88`	`87`