From b3040b5276ce0fc55b9c86b950c0d77cf8af4fcc Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 2 Jul 2012 18:33:21 +0200 Subject: [PATCH] repo git: Remove some redundant lines --- SparkleLib/Git/SparkleRepoGit.cs | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 14fbe401..f63c3b90 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -917,15 +917,18 @@ namespace SparkleLib.Git { string [] lines = output.Split ("\n".ToCharArray ()); foreach (string line in lines) { + if (line.EndsWith (".empty")) + continue; + if (line.StartsWith ("A")) - Added.Add (EnsureSpecialCharacters (line.Substring (3))); + Added.Add (line.Substring (3)); else if (line.StartsWith ("M")) - Modified.Add (EnsureSpecialCharacters (line.Substring (3))); + Modified.Add (line.Substring (3)); else if (line.StartsWith ("D")) - Removed.Add (EnsureSpecialCharacters (line.Substring (3))); + Removed.Add (line.Substring (3)); else if (line.StartsWith ("R")) { - Removed.Add (EnsureSpecialCharacters (line.Substring (3, (line.IndexOf (" -> ") - 3)))); - Added.Add (EnsureSpecialCharacters (line.Substring (line.IndexOf (" -> ") + 4))); + Removed.Add (line.Substring (3, (line.IndexOf (" -> ") - 3))); + Added.Add (line.Substring (line.IndexOf (" -> ") + 4)); } } @@ -935,11 +938,7 @@ namespace SparkleLib.Git { string n = Environment.NewLine; foreach (string added in Added) { - file_name = added; - - if (file_name.EndsWith (".empty")) - file_name = file_name.Substring (0, file_name.Length - 6); - + file_name = added.Trim ("\"".ToCharArray ()); message += "+ ‘" + file_name + "’" + n; count++; @@ -948,11 +947,7 @@ namespace SparkleLib.Git { } foreach (string modified in Modified) { - file_name = modified; - - if (file_name.EndsWith (".empty")) - continue; - + file_name = modified.Trim ("\"".ToCharArray ()); message += "/ ‘" + file_name + "’" + n; count++; @@ -961,11 +956,7 @@ namespace SparkleLib.Git { } foreach (string removed in Removed) { - file_name = removed; - - if (file_name.EndsWith (".empty")) - file_name = file_name.Substring (0, file_name.Length - 6); - + file_name = removed.Trim ("\"".ToCharArray ()); message += "- ‘" + file_name + "’" + n; count++; @@ -973,6 +964,7 @@ namespace SparkleLib.Git { return message + "..." + n; } + message = message.Replace ("\"", ""); return message.TrimEnd (); }