Incorporated Jake's feedback.

Sebastian Nemeth · Sebastian Nemeth · commit f4678549e33c · 2015-03-31T15:42:03.000+03:00
1. Passed down noFetch param to NormalizeGitDirectory method.
2. Updated ArgumentParser to ensure that individual switches such as -nofetch do not interfere with existing functionality.

ArgumentParser should also now support switches with multiple values such as '-myswitch value1 value2' if the validation checks are removed.
diff --git a/GitVersionCore/BuildServers/AppVeyor.cs b/GitVersionCore/BuildServers/AppVeyor.cs
@@ -25,10 +25,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch
                 throw new WarningException("Failed to find .git directory on agent.");
             }
 
-            if (!noFetch)
-            {
-                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
-            }
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
         }
 
         public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
diff --git a/GitVersionCore/BuildServers/ContinuaCi.cs b/GitVersionCore/BuildServers/ContinuaCi.cs
@@ -35,10 +35,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch
                 throw new WarningException("Failed to find .git directory on agent");
             }
 
-            if (!noFetch)
-            {
-                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
-            }
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/BuildServers/GitHelper.cs b/GitVersionCore/BuildServers/GitHelper.cs
@@ -9,8 +9,11 @@ public static class GitHelper
     {
         const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?<issuenumber>[0-9]*)/(merge|head))";
 
-        public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication)
+        public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, bool noFetch)
         {
+            //If noFetch is enabled, then GitVersion will assume that the git repository is normalized before execution, so that fetching from remotes is not required.
+            if (noFetch) return;
+
             using (var repo = new Repository(gitDirectory))
             {
                 var remote = EnsureOnlyOneRemoteIsDefined(repo);
diff --git a/GitVersionCore/BuildServers/MyGet.cs b/GitVersionCore/BuildServers/MyGet.cs
@@ -27,10 +27,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch
                 throw new WarningException("Failed to find .git directory on agent.");
             }
 
-            if (!noFetch)
-            {
-                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
-            }
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/BuildServers/TeamCity.cs b/GitVersionCore/BuildServers/TeamCity.cs
@@ -23,10 +23,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch
                 throw new WarningException("Failed to find .git directory on agent. Please make sure agent checkout mode is enabled for you VCS roots - http://confluence.jetbrains.com/display/TCD8/VCS+Checkout+Mode");
             }
 
-            if (!noFetch)
-            {
-                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
-            }
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionExe.Tests/ArgumentParserTests.cs b/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -218,4 +218,20 @@ public void nofetch_true_when_defined()
         var arguments = ArgumentParser.ParseArguments("-nofetch");
         arguments.NoFetch = true;
     }
+
+    [Test]
+    public void other_arguments_can_be_parsed_before_nofetch()
+    {
+        var arguments = ArgumentParser.ParseArguments("targetpath -nofetch ");
+        arguments.TargetPath = "targetpath";
+        arguments.NoFetch = true;
+    }
+
+    [Test]
+    public void other_arguments_can_be_parsed_after_nofetch()
+    {
+        var arguments = ArgumentParser.ParseArguments("-nofetch -proj foo.sln");
+        arguments.NoFetch = true;
+        arguments.Proj = "foo.sln";
+    }
 }
diff --git a/GitVersionExe/ArgumentParser.cs b/GitVersionExe/ArgumentParser.cs
@@ -2,6 +2,7 @@ namespace GitVersion
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.Specialized;
     using System.Linq;
     using System.Reflection;
 
@@ -66,11 +67,23 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                 arguments.TargetPath = firstArgument;
                 namedArguments = commandLineArguments.Skip(1).ToList();
             }
+            
+            var args = CollectSwitchesAndValuesFromArguments(namedArguments);
 
-            for (var index = 0; index < namedArguments.Count; index = index + 2)
+            foreach (var name in args.AllKeys)
             {
-                var name = namedArguments[index];
-                var value = namedArguments.Count > index + 1 ? namedArguments[index + 1] : null;
+                var values = args.GetValues(name);
+                
+                string value = null;
+                
+                if (values != null)
+                {
+                    //Currently, no arguments use more than one value, so having multiple values is an input error.
+                    //In the future, this exception can be removed to support multiple values for a switch.
+                    if (values.Length > 1) throw new WarningException(string.Format("Could not parse command line parameter '{0}'.", values[1]));
+                    
+                    value = values.FirstOrDefault();
+                }                
 
                 if (IsSwitch("l", name))
                 {
@@ -155,8 +168,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     }
                     else
                     {
-                        arguments.UpdateAssemblyInfo = true;
-                        index--;
+                        arguments.UpdateAssemblyInfo = true;                        
                     }
                     continue;
                 }
@@ -184,8 +196,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     }
                     else
                     {
-                        arguments.ShowConfig = true;
-                        index--;
+                        arguments.ShowConfig = true;                        
                     }
                     continue;
                 }
@@ -214,9 +225,41 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
             return arguments;
         }
 
+        static NameValueCollection CollectSwitchesAndValuesFromArguments(List<string> namedArguments)
+        {
+            var args = new NameValueCollection();
+
+            string currentKey = null;
+            for (var index = 0; index < namedArguments.Count; index = index + 1)
+            {
+                var arg = namedArguments[index];
+                //If this is a switch, create new name/value entry for it, with a null value.
+                if (IsSwitchArgument(arg))
+                {
+                    currentKey = arg;
+                    args.Add(currentKey, null);
+                }
+                    //If this is a value (not a switch)
+                else
+                {
+                    //And if the current switch does not have a value yet, set it's value to this argument.
+                    if (String.IsNullOrEmpty(args[currentKey]))
+                    {
+                        args[currentKey] = arg;
+                    }
+                        //Otherwise add the value under the same switch.
+                    else
+                    {
+                        args.Add(currentKey, arg);
+                    }
+                }
+            }
+            return args;
+        }
+
         static bool IsSwitchArgument(string value)
         {
-            return value != null && (value.StartsWith("-") || value.StartsWith("/"));
+            return value != null && (value.StartsWith("-") || value.StartsWith("/")) && !value.StartsWith("/p:"); //Exclude msbuild parameters, which should be parsed as values, not switch names.
         }
 
         static bool IsSwitch(string switchName, string value)
diff --git a/GitVersionExe/GitPreparer.cs b/GitVersionExe/GitPreparer.cs
@@ -67,7 +67,7 @@ string GetGitInfoFromUrl()
                 });
 
             // Normalize (download branches) before using the branch
-            GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication);
+            GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication, arguments.NoFetch);
 
             using (var repository = new Repository(gitDirectory))
             {
diff --git a/GitVersionTask.Tests/GitHelperTests.cs b/GitVersionTask.Tests/GitHelperTests.cs
@@ -13,7 +13,7 @@ public void CanDetermineTheVersionFromAFetchedMaster()
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/master");
 
         var authentication = new Authentication();
-        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication, false);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -31,7 +31,7 @@ public void CanDetermineTheVersionFromAPullRequest()
         var gitDirectory = FakeTeamCityFetchAndCheckout(repoPath, "refs/pull/1735/merge");
 
         var authentication = new Authentication();
-        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication, false);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -46,7 +46,7 @@ public void CanDetermineTheVersionFromAFetchedDevelop()
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/develop");
 
         var authentication = new Authentication();
-        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication, false);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -61,7 +61,7 @@ public void CanDetermineTheVersionFromAFetchedFeature()
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/feature/one");
 
         var authentication = new Authentication();
-        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication, false);
 
         using (var repository = new Repository(gitDirectory))
         {

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch`
`25`	`25`	`throw new WarningException("Failed to find .git directory on agent.");`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (!noFetch)`
`29`		`- {`
`30`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`31`		`- }`
	`28`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch`
`35`	`35`	`throw new WarningException("Failed to find .git directory on agent");`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (!noFetch)`
`39`		`- {`
`40`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`41`		`- }`
	`38`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);`
`42`	`39`	`}`
`43`	`40`
`44`	`41`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,11 @@ public static class GitHelper`
`9`	`9`	`{`
`10`	`10`	`const string MergeMessageRegexPattern = "refs/heads/(pr\|pull(-requests)?/(?<issuenumber>[0-9]*)/(merge\|head))";`
`11`	`11`
`12`		`- public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication)`
	`12`	`+ public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, bool noFetch)`
`13`	`13`	`{`
	`14`	`+ //If noFetch is enabled, then GitVersion will assume that the git repository is normalized before execution, so that fetching from remotes is not required.`
	`15`	`+ if (noFetch) return;`
	`16`	`+`
`14`	`17`	`using (var repo = new Repository(gitDirectory))`
`15`	`18`	`{`
`16`	`19`	`var remote = EnsureOnlyOneRemoteIsDefined(repo);`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch`
`27`	`27`	`throw new WarningException("Failed to find .git directory on agent.");`
`28`	`28`	`}`
`29`	`29`
`30`		`- if (!noFetch)`
`31`		`- {`
`32`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`33`		`- }`
	`30`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,7 @@ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch`
`23`	`23`	`throw new WarningException("Failed to find .git directory on agent. Please make sure agent checkout mode is enabled for you VCS roots - http://confluence.jetbrains.com/display/TCD8/VCS+Checkout+Mode");`
`24`	`24`	`}`
`25`	`25`
`26`		`- if (!noFetch)`
`27`		`- {`
`28`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`29`		`- }`
	`26`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ string GetGitInfoFromUrl()`
`67`	`67`	`});`
`68`	`68`
`69`	`69`	`// Normalize (download branches) before using the branch`
`70`		`- GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication);`
	`70`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication, arguments.NoFetch);`
`71`	`71`
`72`	`72`	`using (var repository = new Repository(gitDirectory))`
`73`	`73`	`{`