Formatting, typos, annotations

Author: drewnoakes

GitCommands/Git/GitCommandHelpers.cs

@@ -761,7 +761,7 @@ public static GitSubmoduleStatus ParseSubmoduleStatus(string text, GitModule mod
                     // We are looking for lines resembling:
                     //
                     // -Subproject commit bfef4454fc51e345051ee5bf66686dc28deed627
-                    // +Subproject commit 8b20498b954609770205c2cc794b868b4ac3ee69
+                    // +Subproject commit 8b20498b954609770205c2cc794b868b4ac3ee69-dirty
 
                     if (!line.Contains("Subproject"))
                     {

GitCommands/Git/GitModule.cs

@@ -2082,19 +2082,6 @@ public string GetNextRebasePatch()
             return File.Exists(file) ? File.ReadAllText(file).Trim() : "";
         }
 
-        private static string AppendQuotedString(string str1, string str2)
-        {
-            var m1 = QuotedText.Match(str1);
-            var m2 = QuotedText.Match(str2);
-            if (!m1.Success || !m2.Success)
-            {
-                return str1 + str2;
-            }
-
-            Debug.Assert(m1.Groups[1].Value == m2.Groups[1].Value, "m1.Groups[1].Value == m2.Groups[1].Value");
-            return str1.Substring(0, str1.Length - 2) + m2.Groups[2].Value + "?=";
-        }
-
         private static string DecodeString(string str)
         {
             // decode QuotedPrintable text using .NET internal decoder
@@ -2252,6 +2239,19 @@ public IReadOnlyList<PatchFile> GetRebasePatchFiles()
             }
 
             return patchFiles;
+
+            string AppendQuotedString(string str1, string str2)
+            {
+                var m1 = QuotedText.Match(str1);
+                var m2 = QuotedText.Match(str2);
+                if (!m1.Success || !m2.Success)
+                {
+                    return str1 + str2;
+                }
+
+                Debug.Assert(m1.Groups[1].Value == m2.Groups[1].Value, "m1.Groups[1].Value == m2.Groups[1].Value");
+                return str1.Substring(0, str1.Length - 2) + m2.Groups[2].Value + "?=";
+            }
         }
 
         public string CommitCmd(bool amend, bool signOff = false, string author = "", bool useExplicitCommitMessage = true, bool noVerify = false, bool gpgSign = false, string gpgKeyId = "")
@@ -2856,7 +2856,8 @@ public string GetCurrentRemote()
         public string GetRemoteBranch(string branch)
         {
             string remote = GetSetting(string.Format(SettingKeyString.BranchRemote, branch));
-            string merge = GetSetting(string.Format("branch.{0}.merge", branch));
+            string merge = GetSetting($"branch.{branch}.merge");
+
             if (string.IsNullOrEmpty(remote) || string.IsNullOrEmpty(merge))
             {
                 return "";
@@ -3139,25 +3140,41 @@ public string GetTagMessage(string tag)
 
             tag = tag.Trim();
 
-            string info = RunGitCmd("tag -l -n10 " + tag, SystemEncoding);
+            var output = RunGitCmd("tag -l -n10 " + tag, SystemEncoding);
 
-            if (IsGitErrorMessage(info))
+            /*
+             * $ git tag -l -n10 1.50
+             * 1.50            Added close checkbox to process dialog
+             *
+             * $ git tag -l -n10 1.57
+             * 1.57            Minor changes.
+             *
+             *     Packed with Git-1.6.1 to avoid a bug in Git-1.6.2
+             *     When installing 64bit version, both 32bit and 64bit shell extensions will be registered
+             *     Application settings are saved when closing settings dialog instead of when application exits
+             *     Revert commit handles merge conflicts better
+             *     Diff in browse dialog now shows the diff between revisions if 2 revisions are selected
+             *     Bug solved: files in diff viewer are not shown correctly when 2 revisions are selected
+             *     Format path dialog improved
+             */
+
+            if (IsGitErrorMessage(output))
             {
                 return null;
             }
 
-            if (!info.StartsWith(tag))
+            if (!output.StartsWith(tag))
             {
                 return null;
             }
 
-            info = info.Substring(tag.Length).Trim();
-            if (info.Length == 0)
+            output = output.Substring(tag.Length).Trim();
+            if (output.Length == 0)
             {
                 return null;
             }
 
-            return info;
+            return output;
         }
 
         /// <summary>

GitCommands/Patches/PatchManager.cs

@@ -137,7 +137,7 @@ public static byte[] GetSelectedLinesAsNewPatch([NotNull] GitModule module, [Not
                 body = body.Replace("\r", "");
             }
 
-            if (header == null || body == null)
+            if (body == null)
             {
                 return null;
             }
@@ -312,9 +312,8 @@ public string ToIndexPatch(ref int addedCount, ref int removedCount, ref bool we
                 diff = diff.Combine("\n", line.Text);
             }
 
-            for (int i = 0; i < RemovedLines.Count; i++)
+            foreach (var removedLine in RemovedLines)
             {
-                PatchLine removedLine = RemovedLines[i];
                 selectedLastLine = removedLine.Selected;
                 if (removedLine.Selected)
                 {
@@ -397,6 +396,7 @@ public string ToIndexPatch(ref int addedCount, ref int removedCount, ref bool we
         }
 
         // patch base is changed file
+        [CanBeNull]
         public string ToResetWorkTreeLinesPatch(ref int addedCount, ref int removedCount, ref bool wereSelectedLines)
         {
             string diff = null;

GitCommands/Statistics/CommitCounter.cs

@@ -24,6 +24,11 @@ private static (Dictionary<string, int> commitsPerContributor, int totalCommits)
                     .Split('\n');
 
             return ParseCommitsPerContributor(unformattedCommitsPerContributor);
+
+            string GetDateParameter(DateTime sinceDate, string paramName)
+            {
+                return $" --{paramName}=\"{sinceDate:yyyy-MM-dd hh:mm:ss}\"";
+            }
         }
 
         private static (Dictionary<string, int> commitsPerContributor, int totalCommits)
@@ -66,10 +71,5 @@ private static (Dictionary<string, int> commitsPerContributor, int totalCommits)
 
             return (commitsPerContributor, totalCommits);
         }
-
-        private static string GetDateParameter(DateTime sinceDate, string paramName)
-        {
-            return string.Format(" --{1}=\"{0}\"", sinceDate.ToString("yyyy-MM-dd hh:mm:ss"), paramName);
-        }
     }
 }

GitExtensions.sln.DotSettings

@@ -79,6 +79,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitmodule/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitreview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitrevisions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=git_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gmail/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gnore_002Du/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=guitool/@EntryIndexedValue">True</s:Boolean>

GitUI/CommandsDialogs/FormCommit.cs

@@ -1797,15 +1797,11 @@ private void Stage(IReadOnlyList<GitItemStatus> items)
 
                     var files = new List<GitItemStatus>();
 
-                    foreach (var gitItemStatus in items)
+                    foreach (var item in items)
                     {
                         toolStripProgressBar1.Value = Math.Min(toolStripProgressBar1.Maximum - 1, toolStripProgressBar1.Value + 1);
-                        if (gitItemStatus.Name.EndsWith("/"))
-                        {
-                            gitItemStatus.Name = gitItemStatus.Name.TrimEnd('/');
-                        }
-
-                        files.Add(gitItemStatus);
+                        item.Name = item.Name.TrimEnd('/');
+                        files.Add(item);
                     }
 
                     bool wereErrors = false;
@@ -1965,7 +1961,7 @@ private void ResetSoftClick(object sender, EventArgs e)
                                 }
                                 else
                                 {
-                                    Directory.Delete(path, true);
+                                    Directory.Delete(path, recursive: true);
                                 }
                             }
                             catch (IOException)

GitUI/CommandsDialogs/FormPush.cs

@@ -954,7 +954,7 @@ private void LoadMultiBranchViewData(string remote)
                 }
                 else
                 {
-                    // use remote branches from the git's local database if there were problems with receiving branches from the remote server
+                    // use remote branches from git's local database if there were problems with receiving branches from the remote server
                     remoteHeads = Module.GetRemoteBranches().Where(r => r.Remote == remote).ToList();
                 }
 

GitUI/Editor/FileViewer.cs

@@ -1194,17 +1194,14 @@ private void CopyNotStartingWith(char startChar)
                 int pos = noSelection ? 0 : _internalFileViewer.GetSelectionPosition();
                 string fileText = _internalFileViewer.GetText();
 
-                if (pos > 0)
+                if (pos > 0 && fileText[pos - 1] != '\n')
                 {
-                    if (fileText[pos - 1] != '\n')
-                    {
-                        code = " " + code;
-                    }
+                    code = " " + code;
                 }
 
-                IEnumerable<string> lines = code.Split('\n');
-                lines = lines.Where(s => s.Length == 0 || s[0] != startChar || (s.Length > 2 && s[1] == s[0] && s[2] == s[0]));
-                int hpos = fileText.IndexOf("\n@@");
+                var lines = code.Split('\n')
+                    .Where(s => s.Length == 0 || s[0] != startChar || (s.Length > 2 && s[1] == s[0] && s[2] == s[0]));
+                var hpos = fileText.IndexOf("\n@@");
 
                 // if header is selected then don't remove diff extra chars
                 if (hpos <= pos)

GitUI/FormStatus.cs

@@ -91,16 +91,12 @@ public async Task SetProgressAsync(string text)
             int index = text.LastIndexOf('%');
             if (index > 4 && int.TryParse(text.Substring(index - 3, 3), out var progressValue) && progressValue >= 0)
             {
-                if (ProgressBar.Style != ProgressBarStyle.Blocks)
-                {
-                    ProgressBar.Style = ProgressBarStyle.Blocks;
-                }
-
+                ProgressBar.Style = ProgressBarStyle.Blocks;
                 ProgressBar.Value = Math.Min(100, progressValue);
                 TaskbarProgress.SetProgress(TaskbarProgressBarState.Normal, progressValue, 100);
             }
 
-            // Show last progress message in the title, unless it's showin in the control body already
+            // Show last progress message in the title, unless it's showing in the control body already
             if (!ConsoleOutput.IsDisplayingFullProcessOutput)
             {
                 Text = text;

GitUI/UserControls/RevisionGrid/FormQuickGitRefSelector.cs

@@ -86,7 +86,7 @@ public void Init(Action action, IReadOnlyList<IGitRef> refs)
             {
                 // what is this magic number "MaxVisibleItemsWithoutScroll + 0.5"?
                 // we are limiting number of visible items in the listbox before enabling vscroll, this is to reduce the risk of not fitting on user's screen.
-                // when listbox.IntergralHeight=true, the listbox automatically calculates its size and only show full items (i.e. you can't render it
+                // when listbox.IntegralHeight=true, the listbox automatically calculates its size and only show full items (i.e. you can't render it
                 // at 20px high if the ItemHeight=13px, it can only be 13, 26, 39 etc (NB: slightly more if you account for the furniture)).
                 // listbox.PreferredHeight returns the height of the listbox showing all items.
                 // for some strange reason, MaxVisibleItemsWithoutScroll*listbox.ItemHeight renders the listbox showing MaxVisibleItemsWithoutScroll-1 items.

Plugins/GitFlow/GitFlowForm.cs

@@ -94,10 +94,10 @@ private static bool TryExtractBranchFromHead(string currentRef, out string branc
         {
             foreach (Branch branch in Enum.GetValues(typeof(Branch)))
             {
-                var startRef = branch.ToString("G") + "/";
+                var startRef = branch + "/";
                 if (currentRef.StartsWith(startRef))
                 {
-                    branchType = branch.ToString("G");
+                    branchType = branch.ToString();
                     branchName = currentRef.Substring(startRef.Length);
                     return true;
                 }

ResourceManager/LinkFactory.cs

@@ -91,15 +91,23 @@ public string ParseLink(string linkText)
                 return linkUri;
             }
 
-            string uriCandidate = linkText;
-            while (uriCandidate != null)
+            var uriCandidate = linkText;
+
+            while (true)
             {
                 if (Uri.TryCreate(uriCandidate, UriKind.Absolute, out var uri))
                 {
                     return uri.AbsoluteUri;
                 }
 
-                uriCandidate = uriCandidate.SkipStr("#");
+                var idx = uriCandidate.IndexOf('#');
+
+                if (idx == -1)
+                {
+                    break;
+                }
+
+                uriCandidate = uriCandidate.Substring(idx + 1);
             }
 
             return linkText;