Added support for -nofetch command line argument and 'NoFetch' MSBuild Task parameter, to suppress fetching from remotes during execution.

Sebastian Nemeth · Sebastian Nemeth · commit 92231b6f2fd2 · 2015-03-31T10:54:29.000+03:00
diff --git a/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs b/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs
@@ -35,7 +35,7 @@ public override bool CanApplyToCurrentContext()
             throw new NotImplementedException();
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
         {
             throw new NotImplementedException();
         }
diff --git a/GitVersionCore/BuildServers/AppVeyor.cs b/GitVersionCore/BuildServers/AppVeyor.cs
@@ -18,14 +18,17 @@ public override bool CanApplyToCurrentContext()
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
                 throw new WarningException("Failed to find .git directory on agent.");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            if (!noFetch)
+            {
+                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            }
         }
 
         public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
diff --git a/GitVersionCore/BuildServers/BuildServerBase.cs b/GitVersionCore/BuildServers/BuildServerBase.cs
@@ -5,7 +5,7 @@
     public abstract class BuildServerBase : IBuildServer
     {
         public abstract bool CanApplyToCurrentContext();
-        public abstract void PerformPreProcessingSteps(string gitDirectory);
+        public abstract void PerformPreProcessingSteps(string gitDirectory, bool noFetch);
         public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         public abstract string[] GenerateSetParameterMessage(string name, string value);
 
diff --git a/GitVersionCore/BuildServers/ContinuaCi.cs b/GitVersionCore/BuildServers/ContinuaCi.cs
@@ -28,14 +28,17 @@ public override bool CanApplyToCurrentContext()
             return false;
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
                 throw new WarningException("Failed to find .git directory on agent");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            if (!noFetch)
+            {
+                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            }
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/BuildServers/IBuildServer.cs b/GitVersionCore/BuildServers/IBuildServer.cs
@@ -5,7 +5,7 @@
     public interface IBuildServer
     {
         bool CanApplyToCurrentContext();
-        void PerformPreProcessingSteps(string gitDirectory);
+        void PerformPreProcessingSteps(string gitDirectory, bool noFetch);
         string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         string[] GenerateSetParameterMessage(string name, string value);
 
diff --git a/GitVersionCore/BuildServers/MyGet.cs b/GitVersionCore/BuildServers/MyGet.cs
@@ -20,14 +20,17 @@ public override bool CanApplyToCurrentContext()
                 && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
                 throw new WarningException("Failed to find .git directory on agent.");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            if (!noFetch)
+            {
+                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            }
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/BuildServers/TeamCity.cs b/GitVersionCore/BuildServers/TeamCity.cs
@@ -16,14 +16,17 @@ public override bool CanApplyToCurrentContext()
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
                 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");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            if (!noFetch)
+            {
+                GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
+            }
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionExe.Tests/ArgumentParserTests.cs b/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -211,4 +211,11 @@ public void can_log_to_console()
         var arguments = ArgumentParser.ParseArguments("-l console -proj foo.sln");
         arguments.LogFilePath.ShouldBe("console");
     }
+
+    [Test]
+    public void nofetch_true_when_defined()
+    {
+        var arguments = ArgumentParser.ParseArguments("-nofetch");
+        arguments.NoFetch = true;
+    }
 }
diff --git a/GitVersionExe/ArgumentParser.cs b/GitVersionExe/ArgumentParser.cs
@@ -202,6 +202,12 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     continue;
                 }
 
+                if (IsSwitch("nofetch", name))
+                {
+                    arguments.NoFetch = true;
+                    continue;
+                }
+
                 throw new WarningException(string.Format("Could not parse command line parameter '{0}'.", name));
             }
 
diff --git a/GitVersionExe/Arguments.cs b/GitVersionExe/Arguments.cs
@@ -33,5 +33,6 @@ public Arguments()
         public string UpdateAssemblyInfoFileName;
 
         public bool ShowConfig;
+        public bool NoFetch { get; set; }
     }
 }
diff --git a/GitVersionExe/Program.cs b/GitVersionExe/Program.cs
@@ -88,7 +88,7 @@ static int Run()
 
                 foreach (var buildServer in applicableBuildServers)
                 {
-                    buildServer.PerformPreProcessingSteps(gitDirectory);
+                    buildServer.PerformPreProcessingSteps(gitDirectory, arguments.NoFetch);
                 }
                 VersionVariables variables;
                 var versionFinder = new GitVersionFinder();
diff --git a/GitVersionTask.Tests/VersionAndBranchFinderTests.cs b/GitVersionTask.Tests/VersionAndBranchFinderTests.cs
@@ -20,7 +20,7 @@ public void ShouldBeAbleGetVersionFromGitDir()
         }
 
         Tuple<CachedVersion, GitVersionContext> versionAndBranch;
-        VersionAndBranchFinder.TryGetVersion(ASBMTestRepoWorkingDirPath, out versionAndBranch, new Config());
+        VersionAndBranchFinder.TryGetVersion(ASBMTestRepoWorkingDirPath, out versionAndBranch, new Config(), false);
         Assert.IsNotNull(versionAndBranch);
     }
 }
diff --git a/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs b/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
@@ -25,6 +25,8 @@ public class UpdateAssemblyInfo : Task
         [Output]
         public string AssemblyInfoTempFilePath { get; set; }
 
+        public bool NoFetch { get; set; }
+
         TaskLogger logger;
         IFileSystem fileSystem;
 
@@ -73,7 +75,7 @@ public void InnerExecute()
             var configuration = ConfigurationProvider.Provide(gitDirectory, fileSystem);
 
             Tuple<CachedVersion, GitVersionContext> semanticVersion;
-            if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, configuration))
+            if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, configuration, NoFetch))
             {
                 return;
             }
diff --git a/GitVersionTask/GetVersion.cs b/GitVersionTask/GetVersion.cs
@@ -12,6 +12,8 @@ public class GetVersion : Task
         [Required]
         public string SolutionDirectory { get; set; }
 
+        public bool NoFetch { get; set; }
+
         [Output]
         public string Major { get; set; }
 
@@ -85,7 +87,7 @@ public override bool Execute()
                 var gitDirectory = GitDirFinder.TreeWalkForGitDir(SolutionDirectory);
                 var configuration = ConfigurationProvider.Provide(gitDirectory, fileSystem);
 
-                if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch, configuration))
+                if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch, configuration, NoFetch))
                 {
                     var thisType = typeof(GetVersion);
                     var cachedVersion = versionAndBranch.Item1;
diff --git a/GitVersionTask/VersionAndBranchFinder.cs b/GitVersionTask/VersionAndBranchFinder.cs
@@ -5,7 +5,7 @@
 public static class VersionAndBranchFinder
 {
     static List<string> processedDirectories = new List<string>(); 
-    public static bool TryGetVersion(string directory, out Tuple<CachedVersion, GitVersionContext> versionAndBranch, Config configuration)
+    public static bool TryGetVersion(string directory, out Tuple<CachedVersion, GitVersionContext> versionAndBranch, Config configuration, bool noFetch)
     {
         var gitDirectory = GitDirFinder.TreeWalkForGitDir(directory);
 
@@ -28,7 +28,7 @@ public static bool TryGetVersion(string directory, out Tuple<CachedVersion, GitV
             foreach (var buildServer in BuildServerList.GetApplicableBuildServers(authentication))
             {
                 Logger.WriteInfo(string.Format("Executing PerformPreProcessingSteps for '{0}'.", buildServer.GetType().Name));
-                buildServer.PerformPreProcessingSteps(gitDirectory);
+                buildServer.PerformPreProcessingSteps(gitDirectory, noFetch);
             }
         }
         versionAndBranch = VersionCache.GetVersion(gitDirectory, configuration);
diff --git a/GitVersionTask/WriteVersionInfoToBuildLog.cs b/GitVersionTask/WriteVersionInfoToBuildLog.cs
@@ -13,6 +13,8 @@ public class WriteVersionInfoToBuildLog : Task
         [Required]
         public string SolutionDirectory { get; set; }
 
+        public bool NoFetch { get; set; }
+
         TaskLogger logger;
         IFileSystem fileSystem;
 
@@ -52,7 +54,7 @@ public void InnerExecute()
             Tuple<CachedVersion, GitVersionContext> result;
             var gitDirectory = GitDirFinder.TreeWalkForGitDir(SolutionDirectory);
             var configuration = ConfigurationProvider.Provide(gitDirectory, fileSystem);
-            if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out result, configuration))
+            if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out result, configuration, NoFetch))
             {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public override bool CanApplyToCurrentContext()`
`35`	`35`	`throw new NotImplementedException();`
`36`	`36`	`}`
`37`	`37`
`38`		`- public override void PerformPreProcessingSteps(string gitDirectory)`
	`38`	`+ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)`
`39`	`39`	`{`
`40`	`40`	`throw new NotImplementedException();`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,17 @@ public override bool CanApplyToCurrentContext()`
`18`	`18`	`return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));`
`19`	`19`	`}`
`20`	`20`
`21`		`- public override void PerformPreProcessingSteps(string gitDirectory)`
	`21`	`+ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)`
`22`	`22`	`{`
`23`	`23`	`if (string.IsNullOrEmpty(gitDirectory))`
`24`	`24`	`{`
`25`	`25`	`throw new WarningException("Failed to find .git directory on agent.");`
`26`	`26`	`}`
`27`	`27`
`28`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`28`	`+ if (!noFetch)`
	`29`	`+ {`
	`30`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`31`	`+ }`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public abstract class BuildServerBase : IBuildServer`
`6`	`6`	`{`
`7`	`7`	`public abstract bool CanApplyToCurrentContext();`
`8`		`- public abstract void PerformPreProcessingSteps(string gitDirectory);`
	`8`	`+ public abstract void PerformPreProcessingSteps(string gitDirectory, bool noFetch);`
`9`	`9`	`public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);`
`10`	`10`	`public abstract string[] GenerateSetParameterMessage(string name, string value);`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,17 @@ public override bool CanApplyToCurrentContext()`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public override void PerformPreProcessingSteps(string gitDirectory)`
	`31`	`+ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)`
`32`	`32`	`{`
`33`	`33`	`if (string.IsNullOrEmpty(gitDirectory))`
`34`	`34`	`{`
`35`	`35`	`throw new WarningException("Failed to find .git directory on agent");`
`36`	`36`	`}`
`37`	`37`
`38`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`38`	`+ if (!noFetch)`
	`39`	`+ {`
	`40`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`41`	`+ }`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public interface IBuildServer`
`6`	`6`	`{`
`7`	`7`	`bool CanApplyToCurrentContext();`
`8`		`- void PerformPreProcessingSteps(string gitDirectory);`
	`8`	`+ void PerformPreProcessingSteps(string gitDirectory, bool noFetch);`
`9`	`9`	`string GenerateSetVersionMessage(string versionToUseForBuildNumber);`
`10`	`10`	`string[] GenerateSetParameterMessage(string name, string value);`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,17 @@ public override bool CanApplyToCurrentContext()`
`20`	`20`	`&& buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public override void PerformPreProcessingSteps(string gitDirectory)`
	`23`	`+ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)`
`24`	`24`	`{`
`25`	`25`	`if (string.IsNullOrEmpty(gitDirectory))`
`26`	`26`	`{`
`27`	`27`	`throw new WarningException("Failed to find .git directory on agent.");`
`28`	`28`	`}`
`29`	`29`
`30`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`30`	`+ if (!noFetch)`
	`31`	`+ {`
	`32`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,17 @@ public override bool CanApplyToCurrentContext()`
`16`	`16`	`return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));`
`17`	`17`	`}`
`18`	`18`
`19`		`- public override void PerformPreProcessingSteps(string gitDirectory)`
	`19`	`+ public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)`
`20`	`20`	`{`
`21`	`21`	`if (string.IsNullOrEmpty(gitDirectory))`
`22`	`22`	`{`
`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`		`- GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`26`	`+ if (!noFetch)`
	`27`	`+ {`
	`28`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
	`29`	`+ }`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -211,4 +211,11 @@ public void can_log_to_console()`
`211`	`211`	`var arguments = ArgumentParser.ParseArguments("-l console -proj foo.sln");`
`212`	`212`	`arguments.LogFilePath.ShouldBe("console");`
`213`	`213`	`}`
	`214`	`+`
	`215`	`+ [Test]`
	`216`	`+ public void nofetch_true_when_defined()`
	`217`	`+ {`
	`218`	`+ var arguments = ArgumentParser.ParseArguments("-nofetch");`
	`219`	`+ arguments.NoFetch = true;`
	`220`	`+ }`
`214`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,12 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`202`	`202`	`continue;`
`203`	`203`	`}`
`204`	`204`
	`205`	`+ if (IsSwitch("nofetch", name))`
	`206`	`+ {`
	`207`	`+ arguments.NoFetch = true;`
	`208`	`+ continue;`
	`209`	`+ }`
	`210`	`+`
`205`	`211`	`throw new WarningException(string.Format("Could not parse command line parameter '{0}'.", name));`
`206`	`212`	`}`
`207`	`213`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ public Arguments()`
`33`	`33`	`public string UpdateAssemblyInfoFileName;`
`34`	`34`
`35`	`35`	`public bool ShowConfig;`
	`36`	`+ public bool NoFetch { get; set; }`
`36`	`37`	`}`
`37`	`38`	`}`