Logging improvements

Author: JakeGinnivan

GitVersionCore/Logger.cs

@@ -19,8 +19,8 @@ static Logger()
         public static IDisposable IndentLog(string operationDescription)
         {
             var start = DateTime.Now;
-            indent = indent + "  ";
             WriteInfo("Begin: " + operationDescription);
+            indent = indent + "  ";
             return new ActionDisposable(() =>
             {
                 indent = indent.Substring(0, indent.Length - 2);

GitVersionCore/SemanticVersion.cs

@@ -280,22 +280,18 @@ public SemanticVersion IncrementVersion(IncrementStrategy incrementStrategy)
                 switch (incrementStrategy)
                 {
                     case IncrementStrategy.None:
-                        Logger.WriteInfo("Skipping version increment");
                         break;
                     case IncrementStrategy.Major:
-                        Logger.WriteInfo("Incrementing Major Version");
                         incremented.Major++;
                         incremented.Minor = 0;
                         incremented.Patch = 0;
                         break;
                     case IncrementStrategy.Minor:
                         incremented.Minor++;
                         incremented.Patch = 0;
-                        Logger.WriteInfo("Incrementing Minor Version");
                         break;
                     case IncrementStrategy.Patch:
                         incremented.Patch++;
-                        Logger.WriteInfo("Incrementing Patch Version");
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
@@ -305,7 +301,6 @@ public SemanticVersion IncrementVersion(IncrementStrategy incrementStrategy)
             {
                 if (incremented.PreReleaseTag.Number != null)
                 {
-                    Logger.WriteInfo("Incrementing prerelease");
                     incremented.PreReleaseTag.Number = incremented.PreReleaseTag.Number;
                     incremented.PreReleaseTag.Number++;
                 }

GitVersionCore/VersionCalculation/BaseVersionCalculators/HighestTagBaseVersionStrategy.cs

@@ -11,12 +11,17 @@ public override BaseVersion GetVersion(GitVersionContext context)
             if (GetVersion(context, out version))
             {
                 var shouldUpdateVersion = version.Commit.Sha != context.CurrentCommit.Sha;
-                return new BaseVersion(string.Format("Git tag '{0}'", version.Tag), shouldUpdateVersion, version.SemVer, version.Commit, null);
+                return new BaseVersion(FormatSource(version), shouldUpdateVersion, version.SemVer, version.Commit, null);
             }
 
             return null;
         }
 
+        protected virtual string FormatSource(VersionTaggedCommit version)
+        {
+            return string.Format("Git tag '{0}'", version.Tag);
+        }
+
         protected virtual bool IsValidTag(GitVersionContext context, string branchName, Tag tag, Commit commit)
         {
             return tag.PeeledTarget() == commit;
@@ -68,7 +73,7 @@ bool GetVersion(GitVersionContext context, out VersionTaggedCommit versionTagged
             return true;
         }
 
-        class VersionTaggedCommit
+        protected class VersionTaggedCommit
         {
             public string Tag;
             public Commit Commit;

GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackMergeTargetBaseVersionStrategy.cs

@@ -16,9 +16,15 @@ protected override bool IsValidTag(GitVersionContext context, string branchName,
                 }
             }
 
-            return base.IsValidTag(context, branchName, tag, commit);
+            return false;
         }
 
+        protected override string FormatSource(VersionTaggedCommit version)
+        {
+            return string.Format("Merge target tagged '{0}'", version.Tag);
+        }
+
+
         static bool IsDirectMergeFromCommit(Tag tag, Commit commit)
         {
             var targetCommit = tag.Target as Commit;