Prevent fetch for Vso and Jenkins

JakeGinnivan · JakeGinnivan · commit 54cf2c35978f · 2016-01-25T22:30:51.000+08:00
Fixes #604 #606
diff --git a/src/GitVersionCore/BuildServers/BuildServerBase.cs b/src/GitVersionCore/BuildServers/BuildServerBase.cs
@@ -13,6 +13,11 @@ public virtual string GetCurrentBranch()
             return null;
         }
 
+        public virtual bool PreventFetch()
+        {
+            return false;
+        }
+
         public virtual void WriteIntegration(Action<string> writer, VersionVariables variables)
         {
             if (writer == null)
diff --git a/src/GitVersionCore/BuildServers/IBuildServer.cs b/src/GitVersionCore/BuildServers/IBuildServer.cs
@@ -7,8 +7,11 @@ public interface IBuildServer
         bool CanApplyToCurrentContext();
         string GenerateSetVersionMessage(VersionVariables variables);
         string[] GenerateSetParameterMessage(string name, string value);
-
         void WriteIntegration(Action<string> writer, VersionVariables variables);
         string GetCurrentBranch();
+        /// <summary>
+        /// If the build server should not try and fetch
+        /// </summary>
+        bool PreventFetch();
     }
 }
diff --git a/src/GitVersionCore/BuildServers/Jenkins.cs b/src/GitVersionCore/BuildServers/Jenkins.cs
@@ -34,6 +34,16 @@ public override string[] GenerateSetParameterMessage(string name, string value)
             };
         }
 
+        public override string GetCurrentBranch()
+        {
+            return Environment.GetEnvironmentVariable("GIT_BRANCH");
+        }
+
+        public override bool PreventFetch()
+        {
+            return true;
+        }
+
         public override void WriteIntegration(Action<string> writer, VersionVariables variables)
         {
             base.WriteIntegration(writer, variables);
diff --git a/src/GitVersionCore/BuildServers/VsoAgent.cs b/src/GitVersionCore/BuildServers/VsoAgent.cs
@@ -24,6 +24,11 @@ public override string GetCurrentBranch()
             return Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
         }
 
+        public override bool PreventFetch()
+        {
+            return true;
+        }
+
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
             // For VSO, we'll get the Build Number and insert GitVersion variables where
diff --git a/src/GitVersionCore/ExecuteCore.cs b/src/GitVersionCore/ExecuteCore.cs
@@ -22,7 +22,10 @@ public ExecuteCore(IFileSystem fileSystem)
         public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)
         {
             // Normalise if we are running on build server
-            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, noFetch, workingDirectory);
+            var applicableBuildServers = BuildServerList.GetApplicableBuildServers();
+            var buildServer = applicableBuildServers.FirstOrDefault();
+            var fetch = noFetch || (buildServer != null && buildServer.PreventFetch());
+            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, fetch, workingDirectory);
             var dotGitDirectory = gitPreparer.GetDotGitDirectory();
             var projectRoot = gitPreparer.GetProjectRootDirectory();
             Logger.WriteInfo(string.Format("Project root is: " + projectRoot));
@@ -37,7 +40,7 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi
                 var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(repo, dotGitDirectory);
                 if (versionVariables == null)
                 {
-                    versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot);
+                    versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot, buildServer);
                     gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);
                 }
 
@@ -73,11 +76,8 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
             return currentBranch;
         }
 
-        VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot)
+        VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer)
         {
-            var applicableBuildServers = BuildServerList.GetApplicableBuildServers();
-            var buildServer = applicableBuildServers.FirstOrDefault();
-
             gitPreparer.Initialise(buildServer != null, ResolveCurrentBranch(buildServer, targetBranch));
 
             var versionFinder = new GitVersionFinder();
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -6,7 +6,6 @@ namespace GitVersion
     using System.Linq;
     using System.Text.RegularExpressions;
 
-
     public class ArgumentParser
     {
         public static Arguments ParseArguments(string commandLineArguments)
@@ -61,23 +60,23 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                 arguments.TargetPath = firstArgument;
                 namedArguments = commandLineArguments.Skip(1).ToList();
             }
-            
+
             var args = CollectSwitchesAndValuesFromArguments(namedArguments);
 
             foreach (var name in args.AllKeys)
             {
                 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))
                 {
@@ -168,7 +167,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     }
                     else
                     {
-                        arguments.UpdateAssemblyInfo = true;                        
+                        arguments.UpdateAssemblyInfo = true;
                     }
                     continue;
                 }
@@ -186,11 +185,11 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     {
                         versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
                     }
-                    
+
                     if (versionVariable == null)
                     {
                         var messageFormat = "{0} requires a valid version variable.  Available variables are:\n{1}";
-                        var message = string.Format(messageFormat, name, String.Join(", ", VersionVariables.AvailableVariables.Select(x=>string.Concat("'", x, "'"))));
+                        var message = string.Format(messageFormat, name, String.Join(", ", VersionVariables.AvailableVariables.Select(x => string.Concat("'", x, "'"))));
                         throw new WarningException(message);
                     }
 
@@ -210,7 +209,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     }
                     else
                     {
-                        arguments.ShowConfig = true;                        
+                        arguments.ShowConfig = true;
                     }
                     continue;
                 }
@@ -253,15 +252,15 @@ static NameValueCollection CollectSwitchesAndValuesFromArguments(List<string> na
                     currentKey = arg;
                     args.Add(currentKey, null);
                 }
-                    //If this is a value (not a switch)
+                //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]))
+                    if (string.IsNullOrEmpty(args[currentKey]))
                     {
                         args[currentKey] = arg;
                     }
-                        //Otherwise add the value under the same switch.
+                    //Otherwise add the value under the same switch.
                     else
                     {
                         args.Add(currentKey, arg);
@@ -273,7 +272,7 @@ static NameValueCollection CollectSwitchesAndValuesFromArguments(List<string> na
 
         static bool IsSwitchArgument(string value)
         {
-            return value != null && (value.StartsWith("-") || value.StartsWith("/")) 
+            return value != null && (value.StartsWith("-") || value.StartsWith("/"))
                 && !Regex.Match(value, @"/\w+:").Success; //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
         }
 
diff --git a/src/GitVersionExe/Arguments.cs b/src/GitVersionExe/Arguments.cs
@@ -34,6 +34,6 @@ public Arguments()
         public string UpdateAssemblyInfoFileName;
 
         public bool ShowConfig;
-        public bool NoFetch { get; set; }
+        public bool NoFetch;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@ public virtual string GetCurrentBranch()`
`13`	`13`	`return null;`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ public virtual bool PreventFetch()`
	`17`	`+ {`
	`18`	`+ return false;`
	`19`	`+ }`
	`20`	`+`
`16`	`21`	`public virtual void WriteIntegration(Action<string> writer, VersionVariables variables)`
`17`	`22`	`{`
`18`	`23`	`if (writer == null)`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,11 @@ public interface IBuildServer`
`7`	`7`	`bool CanApplyToCurrentContext();`
`8`	`8`	`string GenerateSetVersionMessage(VersionVariables variables);`
`9`	`9`	`string[] GenerateSetParameterMessage(string name, string value);`
`10`		`-`
`11`	`10`	`void WriteIntegration(Action<string> writer, VersionVariables variables);`
`12`	`11`	`string GetCurrentBranch();`
	`12`	`+ /// <summary>`
	`13`	`+ /// If the build server should not try and fetch`
	`14`	`+ /// </summary>`
	`15`	`+ bool PreventFetch();`
`13`	`16`	`}`
`14`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ public override string GetCurrentBranch()`
`24`	`24`	`return Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public override bool PreventFetch()`
	`28`	`+ {`
	`29`	`+ return true;`
	`30`	`+ }`
	`31`	`+`
`27`	`32`	`public override string GenerateSetVersionMessage(VersionVariables variables)`
`28`	`33`	`{`
`29`	`34`	`// For VSO, we'll get the Build Number and insert GitVersion variables where`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ public ExecuteCore(IFileSystem fileSystem)`
`22`	`22`	`public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)`
`23`	`23`	`{`
`24`	`24`	`// Normalise if we are running on build server`
`25`		`- var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, noFetch, workingDirectory);`
	`25`	`+ var applicableBuildServers = BuildServerList.GetApplicableBuildServers();`
	`26`	`+ var buildServer = applicableBuildServers.FirstOrDefault();`
	`27`	`+ var fetch = noFetch \|\| (buildServer != null && buildServer.PreventFetch());`
	`28`	`+ var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, fetch, workingDirectory);`
`26`	`29`	`var dotGitDirectory = gitPreparer.GetDotGitDirectory();`
`27`	`30`	`var projectRoot = gitPreparer.GetProjectRootDirectory();`
`28`	`31`	`Logger.WriteInfo(string.Format("Project root is: " + projectRoot));`
`@@ -37,7 +40,7 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi`
`37`	`40`	`var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(repo, dotGitDirectory);`
`38`	`41`	`if (versionVariables == null)`
`39`	`42`	`{`
`40`		`- versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot);`
	`43`	`+ versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot, buildServer);`
`41`	`44`	`gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);`
`42`	`45`	`}`
`43`	`46`
`@@ -73,11 +76,8 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch`
`73`	`76`	`return currentBranch;`
`74`	`77`	`}`
`75`	`78`
`76`		`- VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot)`
	`79`	`+ VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer)`
`77`	`80`	`{`
`78`		`- var applicableBuildServers = BuildServerList.GetApplicableBuildServers();`
`79`		`- var buildServer = applicableBuildServers.FirstOrDefault();`
`80`		`-`
`81`	`81`	`gitPreparer.Initialise(buildServer != null, ResolveCurrentBranch(buildServer, targetBranch));`
`82`	`82`
`83`	`83`	`var versionFinder = new GitVersionFinder();`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace GitVersion`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Text.RegularExpressions;`
`8`	`8`
`9`		`-`
`10`	`9`	`public class ArgumentParser`
`11`	`10`	`{`
`12`	`11`	`public static Arguments ParseArguments(string commandLineArguments)`
`@@ -61,23 +60,23 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`61`	`60`	`arguments.TargetPath = firstArgument;`
`62`	`61`	`namedArguments = commandLineArguments.Skip(1).ToList();`
`63`	`62`	`}`
`64`		`-`
	`63`	`+`
`65`	`64`	`var args = CollectSwitchesAndValuesFromArguments(namedArguments);`
`66`	`65`
`67`	`66`	`foreach (var name in args.AllKeys)`
`68`	`67`	`{`
`69`	`68`	`var values = args.GetValues(name);`
`70`		`-`
	`69`	`+`
`71`	`70`	`string value = null;`
`72`		`-`
	`71`	`+`
`73`	`72`	`if (values != null)`
`74`	`73`	`{`
`75`	`74`	`//Currently, no arguments use more than one value, so having multiple values is an input error.`
`76`	`75`	`//In the future, this exception can be removed to support multiple values for a switch.`
`77`	`76`	`if (values.Length > 1) throw new WarningException(string.Format("Could not parse command line parameter '{0}'.", values[1]));`
`78`		`-`
	`77`	`+`
`79`	`78`	`value = values.FirstOrDefault();`
`80`		`- }`
	`79`	`+ }`
`81`	`80`
`82`	`81`	`if (IsSwitch("l", name))`
`83`	`82`	`{`
`@@ -168,7 +167,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`168`	`167`	`}`
`169`	`168`	`else`
`170`	`169`	`{`
`171`		`- arguments.UpdateAssemblyInfo = true;`
	`170`	`+ arguments.UpdateAssemblyInfo = true;`
`172`	`171`	`}`
`173`	`172`	`continue;`
`174`	`173`	`}`
`@@ -186,11 +185,11 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`186`	`185`	`{`
`187`	`186`	`versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));`
`188`	`187`	`}`
`189`		`-`
	`188`	`+`
`190`	`189`	`if (versionVariable == null)`
`191`	`190`	`{`
`192`	`191`	`var messageFormat = "{0} requires a valid version variable. Available variables are:\n{1}";`
`193`		`- var message = string.Format(messageFormat, name, String.Join(", ", VersionVariables.AvailableVariables.Select(x=>string.Concat("'", x, "'"))));`
	`192`	`+ var message = string.Format(messageFormat, name, String.Join(", ", VersionVariables.AvailableVariables.Select(x => string.Concat("'", x, "'"))));`
`194`	`193`	`throw new WarningException(message);`
`195`	`194`	`}`
`196`	`195`
`@@ -210,7 +209,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`210`	`209`	`}`
`211`	`210`	`else`
`212`	`211`	`{`
`213`		`- arguments.ShowConfig = true;`
	`212`	`+ arguments.ShowConfig = true;`
`214`	`213`	`}`
`215`	`214`	`continue;`
`216`	`215`	`}`
`@@ -253,15 +252,15 @@ static NameValueCollection CollectSwitchesAndValuesFromArguments(List<string> na`
`253`	`252`	`currentKey = arg;`
`254`	`253`	`args.Add(currentKey, null);`
`255`	`254`	`}`
`256`		`- //If this is a value (not a switch)`
	`255`	`+ //If this is a value (not a switch)`
`257`	`256`	`else`
`258`	`257`	`{`
`259`	`258`	`//And if the current switch does not have a value yet, set it's value to this argument.`
`260`		`- if (String.IsNullOrEmpty(args[currentKey]))`
	`259`	`+ if (string.IsNullOrEmpty(args[currentKey]))`
`261`	`260`	`{`
`262`	`261`	`args[currentKey] = arg;`
`263`	`262`	`}`
`264`		`- //Otherwise add the value under the same switch.`
	`263`	`+ //Otherwise add the value under the same switch.`
`265`	`264`	`else`
`266`	`265`	`{`
`267`	`266`	`args.Add(currentKey, arg);`
`@@ -273,7 +272,7 @@ static NameValueCollection CollectSwitchesAndValuesFromArguments(List<string> na`
`273`	`272`
`274`	`273`	`static bool IsSwitchArgument(string value)`
`275`	`274`	`{`
`276`		`- return value != null && (value.StartsWith("-") \|\| value.StartsWith("/"))`
	`275`	`+ return value != null && (value.StartsWith("-") \|\| value.StartsWith("/"))`
`277`	`276`	`&& !Regex.Match(value, @"/\w+:").Success; //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.`
`278`	`277`	`}`
`279`	`278`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public Arguments()`
`34`	`34`	`public string UpdateAssemblyInfoFileName;`
`35`	`35`
`36`	`36`	`public bool ShowConfig;`
`37`		`- public bool NoFetch { get; set; }`
	`37`	`+ public bool NoFetch;`
`38`	`38`	`}`
`39`	`39`	`}`