Skip to content

Commit 27d0f8e

Browse files
committed
Fixed some urls in exceptions
1 parent 4a44d12 commit 27d0f8e

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ We love contributions to get started contributing you might need:
33

44
- [Get started with git](http://rogerdudler.github.io/git-guide)
55
- [How to create a pull request](https://help.github.com/articles/using-pull-requests)
6-
- [An issue to work on](https://github.com/ParticularLabs/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](http://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
6+
- [An issue to work on](https://github.com/GitTools/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](http://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
77
- An understanding of our [architecture](#architecture) and how [we write tests](#writing-tests)
88

99
Once you know how to create a pull request and have an issue to work on, just post a comment saying you will work on it.

src/GitVersionCore.Tests/ConfigProviderTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,24 @@ public void CanReadOldDocument()
6464
var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(repoPath, fileSystem));
6565
error.Message.ShouldContainWithoutWhitespace(@"GitVersionConfig.yaml contains old configuration, please fix the following errors:
6666
assemblyVersioningScheme has been replaced by assembly-versioning-scheme
67-
develop-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration
68-
release-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration");
67+
develop-branch-tag has been replaced by branch specific configuration.See http://gitversion.readthedocs.org/en/latest/configuration/#branch-configuration
68+
release-branch-tag has been replaced by branch specific configuration.See http://gitversion.readthedocs.org/en/latest/configuration/#branch-configuration");
6969
}
7070

7171
[Test]
7272
public void OverwritesDefaultsWithProvidedConfig()
7373
{
74+
var defaultConfig = ConfigurationProvider.Provide(repoPath, fileSystem);
7475
const string text = @"
7576
next-version: 2.0.0
7677
branches:
7778
develop:
7879
mode: ContinuousDeployment
7980
tag: dev";
8081
SetupConfigFileContent(text);
81-
var defaultConfig = new Config();
8282
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
8383

8484
config.NextVersion.ShouldBe("2.0.0");
85-
config.AssemblyVersioningScheme.ShouldBe(defaultConfig.AssemblyVersioningScheme);
8685
config.Branches["develop"].Increment.ShouldBe(defaultConfig.Branches["develop"].Increment);
8786
config.Branches["develop"].VersioningMode.ShouldBe(defaultConfig.Branches["develop"].VersioningMode);
8887
config.Branches["develop"].Tag.ShouldBe("dev");
@@ -120,7 +119,7 @@ public void CanReadDefaultDocument()
120119
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
121120
config.Branches["develop"].Tag.ShouldBe("unstable");
122121
config.Branches["release[/-]"].Tag.ShouldBe("beta");
123-
config.TagPrefix.ShouldBe(Config.DefaultTagPrefix);
122+
config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
124123
config.NextVersion.ShouldBe(null);
125124
}
126125

src/GitVersionCore/Configuration/LegacyConfigNotifier.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public static void Notify(StringReader reader)
2121
issues.Add("assemblyVersioningScheme has been replaced by assembly-versioning-scheme");
2222

2323
if (legacyConfig.DevelopBranchTag != null)
24-
issues.Add("develop-branch-tag has been replaced by branch specific configuration. See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration");
24+
issues.Add("develop-branch-tag has been replaced by branch specific configuration. See http://gitversion.readthedocs.org/en/latest/configuration/#branch-configuration");
2525

2626
if (legacyConfig.ReleaseBranchTag != null)
27-
issues.Add("release-branch-tag has been replaced by branch specific configuration. See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration");
27+
issues.Add("release-branch-tag has been replaced by branch specific configuration. See http://gitversion.readthedocs.org/en/latest/configuration/#branch-configuration");
2828

2929
if (issues.Any())
3030
throw new OldConfigurationException("GitVersionConfig.yaml contains old configuration, please fix the following errors:\r\n" + string.Join("\r\n", issues));

src/GitVersionCore/GitVersionFinder.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
namespace GitVersion
22
{
3-
using System;
43
using System.IO;
54
using System.Linq;
65
using GitVersion.VersionCalculation;
@@ -16,7 +15,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
1615
var filePath = Path.Combine(context.Repository.GetRepositoryDirectory(), "NextVersion.txt");
1716
if (File.Exists(filePath))
1817
{
19-
throw new Exception("NextVersion.txt has been depreciated. See https://github.com/ParticularLabs/GitVersion/wiki/GitVersionConfig.yaml-Configuration-File for replacement");
18+
throw new WarningException("NextVersion.txt has been depreciated. See http://gitversion.readthedocs.org/en/latest/configuration/ for replacement");
2019
}
2120

2221
return new NextVersionCalculator().FindVersion(context);
@@ -25,7 +24,6 @@ public SemanticVersion FindVersion(GitVersionContext context)
2524
void EnsureMainTopologyConstraints(GitVersionContext context)
2625
{
2726
EnsureLocalBranchExists(context.Repository, "master");
28-
// TODO somehow enforce this? EnsureLocalBranchExists(context.Repository, "develop");
2927
EnsureHeadIsNotDetached(context);
3028
}
3129

@@ -36,7 +34,10 @@ void EnsureHeadIsNotDetached(GitVersionContext context)
3634
return;
3735
}
3836

39-
var message = string.Format("It looks like the branch being examined is a detached Head pointing to commit '{0}'. Without a proper branch name GitVersion cannot determine the build version.", context.CurrentCommit.Id.ToString(7));
37+
var message = string.Format(
38+
"It looks like the branch being examined is a detached Head pointing to commit '{0}'. " +
39+
"Without a proper branch name GitVersion cannot determine the build version.",
40+
context.CurrentCommit.Id.ToString(7));
4041
throw new WarningException(message);
4142
}
4243

0 commit comments

Comments
 (0)