More spelling fun

kevmoo · kevmoo · commit 805d56ee7351 · 2010-11-08T20:21:16.000-08:00
diff --git a/CustomDictionary.xml b/CustomDictionary.xml
@@ -5,6 +5,9 @@
       <Word>ssh</Word>
       <Word>git</Word>
       <Word>gravatar</Word>
+      <Word>dto</Word>
+      <Word>rss</Word>
+      <Word>submodule</Word>
     </Recognized>
   </Words>
 </Dictionary>
diff --git a/GitCommands/Config/ConfigFile.cs b/GitCommands/Config/ConfigFile.cs
@@ -118,7 +118,7 @@ public void Save()
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(_fileName,
+                    .MakeFileTemporaryWritable(_fileName,
                                        x =>
                                        File.WriteAllText(_fileName, configFileContent.ToString(), Settings.Encoding));
             }
diff --git a/GitCommands/FileInfoExtensions.cs b/GitCommands/FileInfoExtensions.cs
@@ -9,7 +9,7 @@ public static class FileInfoExtensions
         ///   Remove all attributes that could cause the file to be read-only 
         ///   and restores them later
         /// </summary>
-        public static void MakeFileTemporaryWriteable(string fileName, Action<string> writableAction)
+        public static void MakeFileTemporaryWritable(string fileName, Action<string> writableAction)
         {
             var fileInfo = new FileInfo(fileName);
             if (!fileInfo.Exists)
diff --git a/GitCommands/Git/GitCommandsHelper.cs b/GitCommands/Git/GitCommandsHelper.cs
@@ -845,7 +845,7 @@ public static string BranchCmd(string branchName, string revision, bool checkout
             return "branch \"" + branchName.Trim() + "\" \"" + revision + "\"";
         }
 
-        public static void UnSetSsh()
+        public static void UnsetSsh()
         {
             Environment.SetEnvironmentVariable("GIT_SSH", "", EnvironmentVariableTarget.Process);
         }
@@ -1252,9 +1252,9 @@ public static string RemoveRemote(string name)
             return RunCmd(Settings.GitCommand, "remote rm \"" + name + "\"");
         }
 
-        public static string RenameRemote(string name, string newname)
+        public static string RenameRemote(string name, string newName)
         {
-            return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newname + "\"");
+            return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newName + "\"");
         }
 
         public static string AddRemote(string name, string path)
@@ -1309,7 +1309,7 @@ public static string GetSetting(string setting)
             return configFile.GetValue(setting);
         }
 
-        public static void UnSetSetting(string setting)
+        public static void UnsetSetting(string setting)
         {
             var configFile = GetLocalConfig();
             configFile.RemoveSetting(setting);
diff --git a/GitCommands/Git/GitHead.cs b/GitCommands/Git/GitHead.cs
@@ -54,7 +54,7 @@ public string TrackingRemote
             set
             {
                 if (String.IsNullOrEmpty(value))
-                    GitCommandHelpers.UnSetSetting(_remoteSettingName);
+                    GitCommandHelpers.UnsetSetting(_remoteSettingName);
                 else
                 {
                     GitCommandHelpers.SetSetting(_remoteSettingName, value);
@@ -75,7 +75,7 @@ public string MergeWith
             set
             {
                 if (String.IsNullOrEmpty(value))
-                    GitCommandHelpers.UnSetSetting(_mergeSettingName);
+                    GitCommandHelpers.UnsetSetting(_mergeSettingName);
                 else
                     GitCommandHelpers.SetSetting(_mergeSettingName, "refs/heads/" + value);
             }
diff --git a/GitCommands/System.cs b/GitCommands/System.cs
@@ -14,9 +14,9 @@ public Tuple(T1 item1, T2 item2)
 
     public static class Tuple
     {
-        public static Tuple<T, S> Create<T, S>(T item1, S item2)
+        public static Tuple<T1, T2> Create<T1, T2>(T1 item1, T2 item2)
         {
-            return new Tuple<T, S>(item1, item2);
+            return new Tuple<T1, T2>(item1, item2);
         }
     }
 }
diff --git a/GitCommands/patch/Patch.cs b/GitCommands/patch/Patch.cs
@@ -11,7 +11,7 @@ public class Patch
         public Patch()
         {
             Apply = true;
-            BookMarks = new List<int>();
+            Bookmarks = new List<int>();
             File = FileType.Text;
         }
 
@@ -35,7 +35,7 @@ public enum FileType
         public int Rate { get; set; }
         public bool Apply { get; set; }
 
-        public List<int> BookMarks { get; set; }
+        public List<int> Bookmarks { get; set; }
 
         public PatchType Type { get; set; }
 
diff --git a/GitCommands/patch/PatchManager.cs b/GitCommands/patch/PatchManager.cs
@@ -163,7 +163,7 @@ private void handleChangeFilePatchType(Patch patch, string[] patchLines)
                             patch.Rate -= 20;
                     }
 
-                    patch.BookMarks.Add(lineNumber);
+                    patch.Bookmarks.Add(lineNumber);
 
                     if (fileLines.Count > lineNumber)
                         fileLines.RemoveAt(lineNumber);
@@ -185,7 +185,7 @@ private void handleChangeFilePatchType(Patch patch, string[] patchLines)
                     }
 
                     fileLines.Insert(lineNumber, insertLine);
-                    patch.BookMarks.Add(lineNumber);
+                    patch.Bookmarks.Add(lineNumber);
 
                     lineNumber++;
                 }
diff --git a/GitUI/FormAddToGitIgnore.cs b/GitUI/FormAddToGitIgnore.cs
@@ -21,7 +21,7 @@ private void AddToIngoreClick(object sender, EventArgs e)
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(Settings.WorkingDir + ".gitignore",
+                    .MakeFileTemporaryWritable(Settings.WorkingDir + ".gitignore",
                                        x =>
                                        {
                                            var gitIgnoreFile = new StringBuilder();
diff --git a/GitUI/FormCherryPickCommitSmall.cs b/GitUI/FormCherryPickCommitSmall.cs
@@ -6,9 +6,9 @@ namespace GitUI
 {
     public partial class FormCherryPickCommitSmall : GitExtensionsForm
     {
-        public FormCherryPickCommitSmall(GitRevision Revision)
+        public FormCherryPickCommitSmall(GitRevision revision)
         {
-            this.Revision = Revision;
+            this.Revision = revision;
 
             InitializeComponent(); Translate();
         }
diff --git a/GitUI/FormGitAttributes.cs b/GitUI/FormGitAttributes.cs
@@ -33,7 +33,7 @@ public FormGitAttributes()
         private void SaveClick(object sender, EventArgs e)
         {
             FileInfoExtensions
-                .MakeFileTemporaryWriteable(
+                .MakeFileTemporaryWritable(
                     Settings.WorkingDir + ".gitattributes",
                     x =>
                         {
diff --git a/GitUI/FormGitIgnore.cs b/GitUI/FormGitIgnore.cs
@@ -34,7 +34,7 @@ private void SaveClick(object sender, EventArgs e)
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(
+                    .MakeFileTemporaryWritable(
                         Settings.WorkingDir + ".gitignore",
                         x =>
                             {
diff --git a/GitUI/FormMailMap.cs b/GitUI/FormMailMap.cs
@@ -32,7 +32,7 @@ public FormMailMap()
         private void SaveClick(object sender, EventArgs e)
         {
             FileInfoExtensions
-                .MakeFileTemporaryWriteable(
+                .MakeFileTemporaryWritable(
                     Settings.WorkingDir + ".mailmap",
                     x =>
                         {
diff --git a/GitUI/FormSettings.cs b/GitUI/FormSettings.cs
@@ -456,7 +456,7 @@ private bool Save()
             }
 
             if (OpenSSH.Checked)
-                GitCommandHelpers.UnSetSsh();
+                GitCommandHelpers.UnsetSsh();
 
             if (Putty.Checked)
                 GitCommandHelpers.SetSsh(PlinkPath.Text);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void Save()`
`118`	`118`	`try`
`119`	`119`	`{`
`120`	`120`	`FileInfoExtensions`
`121`		`- .MakeFileTemporaryWriteable(_fileName,`
	`121`	`+ .MakeFileTemporaryWritable(_fileName,`
`122`	`122`	`x =>`
`123`	`123`	`File.WriteAllText(_fileName, configFileContent.ToString(), Settings.Encoding));`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public static class FileInfoExtensions`
`9`	`9`	`/// Remove all attributes that could cause the file to be read-only`
`10`	`10`	`/// and restores them later`
`11`	`11`	`/// </summary>`
`12`		`- public static void MakeFileTemporaryWriteable(string fileName, Action<string> writableAction)`
	`12`	`+ public static void MakeFileTemporaryWritable(string fileName, Action<string> writableAction)`
`13`	`13`	`{`
`14`	`14`	`var fileInfo = new FileInfo(fileName);`
`15`	`15`	`if (!fileInfo.Exists)`
Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ public static string BranchCmd(string branchName, string revision, bool checkout`
`845`	`845`	`return "branch \"" + branchName.Trim() + "\" \"" + revision + "\"";`
`846`	`846`	`}`
`847`	`847`
`848`		`- public static void UnSetSsh()`
	`848`	`+ public static void UnsetSsh()`
`849`	`849`	`{`
`850`	`850`	`Environment.SetEnvironmentVariable("GIT_SSH", "", EnvironmentVariableTarget.Process);`
`851`	`851`	`}`
`@@ -1252,9 +1252,9 @@ public static string RemoveRemote(string name)`
`1252`	`1252`	`return RunCmd(Settings.GitCommand, "remote rm \"" + name + "\"");`
`1253`	`1253`	`}`
`1254`	`1254`
`1255`		`- public static string RenameRemote(string name, string newname)`
	`1255`	`+ public static string RenameRemote(string name, string newName)`
`1256`	`1256`	`{`
`1257`		`- return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newname + "\"");`
	`1257`	`+ return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newName + "\"");`
`1258`	`1258`	`}`
`1259`	`1259`
`1260`	`1260`	`public static string AddRemote(string name, string path)`
`@@ -1309,7 +1309,7 @@ public static string GetSetting(string setting)`
`1309`	`1309`	`return configFile.GetValue(setting);`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`		`- public static void UnSetSetting(string setting)`
	`1312`	`+ public static void UnsetSetting(string setting)`
`1313`	`1313`	`{`
`1314`	`1314`	`var configFile = GetLocalConfig();`
`1315`	`1315`	`configFile.RemoveSetting(setting);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public string TrackingRemote`
`54`	`54`	`set`
`55`	`55`	`{`
`56`	`56`	`if (String.IsNullOrEmpty(value))`
`57`		`- GitCommandHelpers.UnSetSetting(_remoteSettingName);`
	`57`	`+ GitCommandHelpers.UnsetSetting(_remoteSettingName);`
`58`	`58`	`else`
`59`	`59`	`{`
`60`	`60`	`GitCommandHelpers.SetSetting(_remoteSettingName, value);`
`@@ -75,7 +75,7 @@ public string MergeWith`
`75`	`75`	`set`
`76`	`76`	`{`
`77`	`77`	`if (String.IsNullOrEmpty(value))`
`78`		`- GitCommandHelpers.UnSetSetting(_mergeSettingName);`
	`78`	`+ GitCommandHelpers.UnsetSetting(_mergeSettingName);`
`79`	`79`	`else`
`80`	`80`	`GitCommandHelpers.SetSetting(_mergeSettingName, "refs/heads/" + value);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ public Tuple(T1 item1, T2 item2)`
`14`	`14`
`15`	`15`	`public static class Tuple`
`16`	`16`	`{`
`17`		`- public static Tuple<T, S> Create<T, S>(T item1, S item2)`
	`17`	`+ public static Tuple<T1, T2> Create<T1, T2>(T1 item1, T2 item2)`
`18`	`18`	`{`
`19`		`- return new Tuple<T, S>(item1, item2);`
	`19`	`+ return new Tuple<T1, T2>(item1, item2);`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class Patch`
`11`	`11`	`public Patch()`
`12`	`12`	`{`
`13`	`13`	`Apply = true;`
`14`		`- BookMarks = new List<int>();`
	`14`	`+ Bookmarks = new List<int>();`
`15`	`15`	`File = FileType.Text;`
`16`	`16`	`}`
`17`	`17`
`@@ -35,7 +35,7 @@ public enum FileType`
`35`	`35`	`public int Rate { get; set; }`
`36`	`36`	`public bool Apply { get; set; }`
`37`	`37`
`38`		`- public List<int> BookMarks { get; set; }`
	`38`	`+ public List<int> Bookmarks { get; set; }`
`39`	`39`
`40`	`40`	`public PatchType Type { get; set; }`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ private void handleChangeFilePatchType(Patch patch, string[] patchLines)`
`163`	`163`	`patch.Rate -= 20;`
`164`	`164`	`}`
`165`	`165`
`166`		`- patch.BookMarks.Add(lineNumber);`
	`166`	`+ patch.Bookmarks.Add(lineNumber);`
`167`	`167`
`168`	`168`	`if (fileLines.Count > lineNumber)`
`169`	`169`	`fileLines.RemoveAt(lineNumber);`
`@@ -185,7 +185,7 @@ private void handleChangeFilePatchType(Patch patch, string[] patchLines)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`fileLines.Insert(lineNumber, insertLine);`
`188`		`- patch.BookMarks.Add(lineNumber);`
	`188`	`+ patch.Bookmarks.Add(lineNumber);`
`189`	`189`
`190`	`190`	`lineNumber++;`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ private void AddToIngoreClick(object sender, EventArgs e)`
`21`	`21`	`try`
`22`	`22`	`{`
`23`	`23`	`FileInfoExtensions`
`24`		`- .MakeFileTemporaryWriteable(Settings.WorkingDir + ".gitignore",`
	`24`	`+ .MakeFileTemporaryWritable(Settings.WorkingDir + ".gitignore",`
`25`	`25`	`x =>`
`26`	`26`	`{`
`27`	`27`	`var gitIgnoreFile = new StringBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ namespace GitUI`
`6`	`6`	`{`
`7`	`7`	`public partial class FormCherryPickCommitSmall : GitExtensionsForm`
`8`	`8`	`{`
`9`		`- public FormCherryPickCommitSmall(GitRevision Revision)`
	`9`	`+ public FormCherryPickCommitSmall(GitRevision revision)`
`10`	`10`	`{`
`11`		`- this.Revision = Revision;`
	`11`	`+ this.Revision = revision;`
`12`	`12`
`13`	`13`	`InitializeComponent(); Translate();`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public FormGitAttributes()`
`33`	`33`	`private void SaveClick(object sender, EventArgs e)`
`34`	`34`	`{`
`35`	`35`	`FileInfoExtensions`
`36`		`- .MakeFileTemporaryWriteable(`
	`36`	`+ .MakeFileTemporaryWritable(`
`37`	`37`	`Settings.WorkingDir + ".gitattributes",`
`38`	`38`	`x =>`
`39`	`39`	`{`