Browse Source

More spelling fun

LibGit2Sharp
Kevin Moore 15 years ago
parent
commit
805d56ee73
  1. 3
      CustomDictionary.xml
  2. 2
      GitCommands/Config/ConfigFile.cs
  3. 2
      GitCommands/FileInfoExtensions.cs
  4. 8
      GitCommands/Git/GitCommandsHelper.cs
  5. 4
      GitCommands/Git/GitHead.cs
  6. 4
      GitCommands/System.cs
  7. 4
      GitCommands/patch/Patch.cs
  8. 4
      GitCommands/patch/PatchManager.cs
  9. 2
      GitUI/FormAddToGitIgnore.cs
  10. 4
      GitUI/FormCherryPickCommitSmall.cs
  11. 2
      GitUI/FormGitAttributes.cs
  12. 2
      GitUI/FormGitIgnore.cs
  13. 2
      GitUI/FormMailMap.cs
  14. 2
      GitUI/FormSettings.cs

3
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>

2
GitCommands/Config/ConfigFile.cs

@ -118,7 +118,7 @@ namespace GitCommands.Config
try
{
FileInfoExtensions
.MakeFileTemporaryWriteable(_fileName,
.MakeFileTemporaryWritable(_fileName,
x =>
File.WriteAllText(_fileName, configFileContent.ToString(), Settings.Encoding));
}

2
GitCommands/FileInfoExtensions.cs

@ -9,7 +9,7 @@ namespace GitCommands
/// 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)

8
GitCommands/Git/GitCommandsHelper.cs

@ -845,7 +845,7 @@ namespace GitCommands
return "branch \"" + branchName.Trim() + "\" \"" + revision + "\"";
}
public static void UnSetSsh()
public static void UnsetSsh()
{
Environment.SetEnvironmentVariable("GIT_SSH", "", EnvironmentVariableTarget.Process);
}
@ -1252,9 +1252,9 @@ namespace GitCommands
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 @@ namespace GitCommands
return configFile.GetValue(setting);
}
public static void UnSetSetting(string setting)
public static void UnsetSetting(string setting)
{
var configFile = GetLocalConfig();
configFile.RemoveSetting(setting);

4
GitCommands/Git/GitHead.cs

@ -54,7 +54,7 @@ namespace GitCommands
set
{
if (String.IsNullOrEmpty(value))
GitCommandHelpers.UnSetSetting(_remoteSettingName);
GitCommandHelpers.UnsetSetting(_remoteSettingName);
else
{
GitCommandHelpers.SetSetting(_remoteSettingName, value);
@ -75,7 +75,7 @@ namespace GitCommands
set
{
if (String.IsNullOrEmpty(value))
GitCommandHelpers.UnSetSetting(_mergeSettingName);
GitCommandHelpers.UnsetSetting(_mergeSettingName);
else
GitCommandHelpers.SetSetting(_mergeSettingName, "refs/heads/" + value);
}

4
GitCommands/System.cs

@ -14,9 +14,9 @@ namespace System
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);
}
}
}

4
GitCommands/patch/Patch.cs

@ -11,7 +11,7 @@ namespace PatchApply
public Patch()
{
Apply = true;
BookMarks = new List<int>();
Bookmarks = new List<int>();
File = FileType.Text;
}
@ -35,7 +35,7 @@ namespace PatchApply
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; }

4
GitCommands/patch/PatchManager.cs

@ -163,7 +163,7 @@ namespace PatchApply
patch.Rate -= 20;
}
patch.BookMarks.Add(lineNumber);
patch.Bookmarks.Add(lineNumber);
if (fileLines.Count > lineNumber)
fileLines.RemoveAt(lineNumber);
@ -185,7 +185,7 @@ namespace PatchApply
}
fileLines.Insert(lineNumber, insertLine);
patch.BookMarks.Add(lineNumber);
patch.Bookmarks.Add(lineNumber);
lineNumber++;
}

2
GitUI/FormAddToGitIgnore.cs

@ -21,7 +21,7 @@ namespace GitUI
try
{
FileInfoExtensions
.MakeFileTemporaryWriteable(Settings.WorkingDir + ".gitignore",
.MakeFileTemporaryWritable(Settings.WorkingDir + ".gitignore",
x =>
{
var gitIgnoreFile = new StringBuilder();

4
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();
}

2
GitUI/FormGitAttributes.cs

@ -33,7 +33,7 @@ namespace GitUI
private void SaveClick(object sender, EventArgs e)
{
FileInfoExtensions
.MakeFileTemporaryWriteable(
.MakeFileTemporaryWritable(
Settings.WorkingDir + ".gitattributes",
x =>
{

2
GitUI/FormGitIgnore.cs

@ -34,7 +34,7 @@ namespace GitUI
try
{
FileInfoExtensions
.MakeFileTemporaryWriteable(
.MakeFileTemporaryWritable(
Settings.WorkingDir + ".gitignore",
x =>
{

2
GitUI/FormMailMap.cs

@ -32,7 +32,7 @@ namespace GitUI
private void SaveClick(object sender, EventArgs e)
{
FileInfoExtensions
.MakeFileTemporaryWriteable(
.MakeFileTemporaryWritable(
Settings.WorkingDir + ".mailmap",
x =>
{

2
GitUI/FormSettings.cs

@ -456,7 +456,7 @@ namespace GitUI
}
if (OpenSSH.Checked)
GitCommandHelpers.UnSetSsh();
GitCommandHelpers.UnsetSsh();
if (Putty.Checked)
GitCommandHelpers.SetSsh(PlinkPath.Text);

Loading…
Cancel
Save