Cleaning up code style.

otac0n · Sep 23, 2011 · ab183ad · ab183ad
1 parent bb99a0a
commit ab183ad
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 40 deletions.
diff --git a/WebGitNet.RepoImpact/AssemblyInstaller.cs b/WebGitNet.RepoImpact/AssemblyInstaller.cs
@@ -1,4 +1,11 @@
-namespace WebGitNet.RepoImpact
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInstaller.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
+
+namespace WebGitNet.RepoImpact
 {
     using System.Web.Mvc;
     using Castle.MicroKernel.Registration;

diff --git a/WebGitNet.RepoImpact/Controllers/ImpactController.cs b/WebGitNet.RepoImpact/Controllers/ImpactController.cs
@@ -1,12 +1,19 @@
-namespace WebGitNet.Controllers
+//-----------------------------------------------------------------------
+// <copyright file="ImpactController.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
+
+namespace WebGitNet.Controllers
 {
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.Linq;
     using System.Text;
     using System.Web.Mvc;
     using System.Web.Routing;
-    using System.Globalization;
     using WebGitNet.Models;
 
     public class ImpactController : SharedControllerBase

diff --git a/WebGitNet.RepoImpact/Models/ImpactWeek.cs b/WebGitNet.RepoImpact/Models/ImpactWeek.cs
@@ -1,4 +1,11 @@
-namespace WebGitNet.Models
+//-----------------------------------------------------------------------
+// <copyright file="ImpactWeek.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
+
+namespace WebGitNet.Models
 {
     using System;
     using System.Collections.Generic;

diff --git a/WebGitNet.RepoImpact/Models/RepoImpact.cs b/WebGitNet.RepoImpact/Models/RepoImpact.cs
@@ -1,4 +1,11 @@
-namespace WebGitNet.Models
+//-----------------------------------------------------------------------
+// <copyright file="RepoImpact.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
+
+namespace WebGitNet.Models
 {
     using System.Linq;
 

diff --git a/WebGitNet.SharedLib/GitErrorException.cs b/WebGitNet.SharedLib/GitErrorException.cs
@@ -26,10 +26,19 @@ public GitErrorException(string command, int exitCode, string errorOutput)
             this.errorOutput = errorOutput;
         }
 
-        public string Command { get { return this.command; } }
+        public string Command
+        {
+            get { return this.command; }
+        }
 
-        public int ExitCode { get { return this.exitCode; } }
+        public int ExitCode
+        {
+            get { return this.exitCode; }
+        }
 
-        public string ErrorOutput { get { return this.errorOutput; } }
+        public string ErrorOutput
+        {
+            get { return this.errorOutput; }
+        }
     }
 }
diff --git a/WebGitNet.SharedLib/GitRef.cs b/WebGitNet.SharedLib/GitRef.cs
@@ -55,8 +55,11 @@ public GitRef(string shaId, string refPath)
         }
 
         public string ShaId { get; private set; }
+
         public string Name { get; private set; }
+
         public string RefPath { get; private set; }
+
         public RefType RefType { get; private set; }
     }
 }
diff --git a/WebGitNet.SharedLib/GitUtilities.cs b/WebGitNet.SharedLib/GitUtilities.cs
@@ -47,6 +47,7 @@ private static string Q(string argument)
                         break;
                 }
             }
+
             result.Append("\"");
             return result.ToString();
         }
@@ -189,22 +190,39 @@ public static List<LogEntry> GetLogEntries(string repoPath, int count, int skip
         private class Author
         {
             public string Name { get; set; }
+
             public string Email { get; set; }
         }
 
         private static Author Rename(Author author, IList<RenameEntry> entries)
         {
             Func<RenameField, Author, string> getField = (f, a) =>
             {
-                if (f == RenameField.Name) return a.Name;
-                if (f == RenameField.Email) return a.Email;
+                if (f == RenameField.Name)
+                {
+                    return a.Name;
+                }
+
+                if (f == RenameField.Email)
+                {
+                    return a.Email;
+                }
+
                 return null;
             };
 
             Action<RenameField, Author, string> setField = (f, a, v) =>
             {
-                if (f == RenameField.Name) a.Name = v;
-                if (f == RenameField.Email) a.Email = v;
+                if (f == RenameField.Name)
+                {
+                    a.Name = v;
+                }
+
+                if (f == RenameField.Email)
+                {
+                    a.Email = v;
+                }
+
                 return;
             };
 
@@ -222,6 +240,7 @@ private static Author Rename(Author author, IList<RenameEntry> entries)
                                 setField(dest.Field, author, dest.Replacement);
                             }
                         }
+
                         break;
 
                     case RenameStyle.CaseInsensitive:
@@ -232,6 +251,7 @@ private static Author Rename(Author author, IList<RenameEntry> entries)
                                 setField(dest.Field, author, dest.Replacement);
                             }
                         }
+
                         break;
 
                     case RenameStyle.Regex:
@@ -242,8 +262,10 @@ private static Author Rename(Author author, IList<RenameEntry> entries)
                             {
                                 setField(dest.Field, newAuthor, Regex.Replace(getField(entry.SourceField, author), entry.Match, dest.Replacement));
                             }
+
                             author = newAuthor;
                         }
+
                         break;
                 }
             }
@@ -253,7 +275,7 @@ private static Author Rename(Author author, IList<RenameEntry> entries)
 
         public static Dictionary<string, int> GetLanguageLines(string repoPath)
         {
-            const string fakeHash = "0000000000000000000000000000000000000000";
+            const string FakeHash = "0000000000000000000000000000000000000000";
 
             var result = Execute("diff-tree -z --numstat 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD", repoPath);
             var fileStats = result.Split("\0".ToArray(), StringSplitOptions.RemoveEmptyEntries);
@@ -273,7 +295,7 @@ public static Dictionary<string, int> GetLanguageLines(string repoPath)
                     continue;
                 }
 
-                bool keepPath = ProcessIgnores(ignores, fakeHash, path);
+                bool keepPath = ProcessIgnores(ignores, FakeHash, path);
                 if (!keepPath)
                 {
                     continue;

diff --git a/WebGitNet.SharedLib/IgnoreEntry.cs b/WebGitNet.SharedLib/IgnoreEntry.cs
@@ -7,12 +7,9 @@
 
 namespace WebGitNet
 {
-    using System;
-    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.Linq;
-    using System.Web;
     using System.Text.RegularExpressions;
-    using System.Collections.ObjectModel;
 
     public class IgnoreEntry
     {
@@ -75,7 +72,10 @@ public bool IsMatch(string path)
                     }
                 }
 
-                if (match) return true;
+                if (match)
+                {
+                    return true;
+                }
             }
 
             return false;

diff --git a/WebGitNet.SharedLib/IgnoreFileParser.cs b/WebGitNet.SharedLib/IgnoreFileParser.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="IgnoreFilerParser.cs" company="(none)">
+// <copyright file="IgnoreFileParser.cs" company="(none)">
 //  Copyright © 2011 John Gietzen. All rights reserved.
 // </copyright>
 // <author>John Gietzen</author>

diff --git a/WebGitNet.SharedLib/PathUtilities.cs b/WebGitNet.SharedLib/PathUtilities.cs
@@ -1,4 +1,11 @@
-namespace WebGitNet
+//-----------------------------------------------------------------------
+// <copyright file="PathUtilities.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
+
+namespace WebGitNet
 {
     using System;
     using System.Collections.Generic;

diff --git a/WebGitNet.SharedLib/RenameFileParser.cs b/WebGitNet.SharedLib/RenameFileParser.cs
@@ -101,13 +101,15 @@ private static RenameEntry Parse(string line)
             RenameEntry.Destination[] destinations;
             if (destinationField2 == RenameField.None)
             {
-                destinations = new[] {
+                destinations = new[]
+                {
                     new RenameEntry.Destination { Field = destinationField1, Replacement = destinationValue1 },
                 };
             }
             else
             {
-                destinations = new[] {
+                destinations = new[]
+                {
                     new RenameEntry.Destination { Field = destinationField1, Replacement = destinationValue1 },
                     new RenameEntry.Destination { Field = destinationField2, Replacement = destinationValue2 },
                 };

diff --git a/WebGitNet/Controllers/BrowseController.cs b/WebGitNet/Controllers/BrowseController.cs
@@ -13,9 +13,9 @@ namespace WebGitNet.Controllers
     using System.Linq;
     using System.Text.RegularExpressions;
     using System.Web.Mvc;
+    using System.Web.Routing;
     using WebGitNet.ActionResults;
     using WebGitNet.Models;
-    using System.Web.Routing;
 
     public class BrowseController : SharedControllerBase
     {
@@ -87,8 +87,8 @@ public ActionResult ViewCommits(string repo, int page = 1)
                 return HttpNotFound();
             }
 
-            const int pageSize = 20;
-            int skip = pageSize * (page - 1);
+            const int PageSize = 20;
+            int skip = PageSize * (page - 1);
             var count = GitUtilities.CountCommits(resourceInfo.FullPath);
 
             if (skip >= count)
@@ -99,10 +99,10 @@ public ActionResult ViewCommits(string repo, int page = 1)
             AddRepoBreadCrumb(repo);
             this.BreadCrumbs.Append("Browse", "ViewCommits", "Commit Log", new { repo });
 
-            var commits = GitUtilities.GetLogEntries(resourceInfo.FullPath, pageSize, skip);
+            var commits = GitUtilities.GetLogEntries(resourceInfo.FullPath, PageSize, skip);
 
             ViewBag.Page = page;
-            ViewBag.PageCount = (count / pageSize) + (count % pageSize > 0 ? 1 : 0);
+            ViewBag.PageCount = (count / PageSize) + (count % PageSize > 0 ? 1 : 0);
             ViewBag.RepoName = resourceInfo.Name;
 
             return View(commits);

diff --git a/WebGitNet/Controllers/FileController.cs b/WebGitNet/Controllers/FileController.cs
@@ -100,7 +100,6 @@ public void RegisterRoutes(RouteCollection routes)
                     "File Access",
                     "git/{*url}",
                     new { controller = "File", action = "Fetch" });
-
             }
         }
     }

diff --git a/WebGitNet/Global.asax.cs b/WebGitNet/Global.asax.cs
@@ -11,9 +11,9 @@ namespace WebGitNet
     using System.Web.Mvc;
     using System.Web.Routing;
     using Castle.MicroKernel.Registration;
+    using Castle.MicroKernel.SubSystems.Configuration;
     using Castle.Windsor;
     using Castle.Windsor.Installer;
-    using Castle.MicroKernel.SubSystems.Configuration;
 
     public partial class WebGitNetApplication : System.Web.HttpApplication
     {

diff --git a/WebGitNet/ResourceRazorViewEngine.cs b/WebGitNet/ResourceRazorViewEngine.cs
@@ -1,16 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Reflection;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading;
+//-----------------------------------------------------------------------
+// <copyright file="ResourceRazorViewEngine.cs" company="(none)">
+//  Copyright © 2011 John Gietzen. All rights reserved.
+// </copyright>
+// <author>John Gietzen</author>
+//-----------------------------------------------------------------------
 
 namespace WebGitNet
 {
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Reflection;
+    using System.Security.Cryptography;
+    using System.Text;
+    using System.Threading;
+    using System.Web;
+    using System.Web.Mvc;
+
     public class ResourceRazorViewEngine : RazorViewEngine
     {
         private Dictionary<string, string> resourceHashChache = new Dictionary<string, string>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,6 @@ public void RegisterRoutes(RouteCollection routes) @@
                         "File Access",
                         "git/{*url}",
                         new { controller = "File", action = "Fetch" });
                 }
             }
         }
@@ Expand Down @@