Skip to content

Filter tag method refactor followup #1383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 2 commits into from
Mar 21, 2018
Merged

Filter tag method refactor followup #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfda6f8
Small formatting changes
jkingry Mar 12, 2018
5109742
Factored out version-able tag filter logic into a method
jkingry Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/GitVersionCore/GitRepoMetadataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,25 @@ public GitRepoMetadataProvider(IRepository repository, Config configuration)
this.configuration = configuration;
}

public static IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(IRepository repository, string tagPrefixRegex, DateTimeOffset? olderThan = null)
{
var tags = new List<Tuple<Tag, SemanticVersion>>();

foreach (var tag in repository.Tags)
{
if (olderThan.HasValue && ((Commit)tag.PeeledTarget()).When() > olderThan.Value)
continue;

SemanticVersion semver;
if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, out semver))
{
tags.Add(Tuple.Create(tag, semver));
}
}

return tags;
}

public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex)
{
if (semanticVersionTagsOnBranchCache.ContainsKey(branch))
Expand All @@ -34,15 +53,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string

using (Logger.IndentLog(string.Format("Getting version tags from branch '{0}'.", branch.CanonicalName)))
{
var tags = new List<Tuple<Tag, SemanticVersion>>();
foreach(var t in this.Repository.Tags)
{
SemanticVersion semver;
if (SemanticVersion.TryParse(t.FriendlyName, tagPrefixRegex, out semver))
{
tags.Add(Tuple.Create(t, semver));
}
}
var tags = GetValidVersionTags(this.Repository, tagPrefixRegex);

var versionTags = branch.Commits.SelectMany(c => tags.Where(t => c.Sha == t.Item1.Target.Sha).Select(t => t.Item2)).ToList();

Expand Down Expand Up @@ -225,7 +236,7 @@ List<BranchCommit> GetMergeCommitsForBranch(Branch branch, Branch[] excludedBran

var currentBranchConfig = configuration.GetConfigForBranch(branch.NameWithoutRemote());
var regexesToCheck = currentBranchConfig == null
? new [] { ".*" } // Match anything if we can't find a branch config
? new[] { ".*" } // Match anything if we can't find a branch config
: currentBranchConfig.SourceBranches.Select(sb => configuration.Branches[sb].Regex);
var branchMergeBases = Repository.Branches
.ExcludingBranches(excludedBranches)
Expand Down
18 changes: 2 additions & 16 deletions src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,8 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)

public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Branch currentBranch, DateTimeOffset? olderThan)
{
var allTags = new List<Tuple<Tag, SemanticVersion>>();
foreach(var tag in context.Repository.Tags)
{
if (olderThan.HasValue && ((Commit)tag.PeeledTarget()).When() > olderThan.Value)
continue;

SemanticVersion version;

if (!SemanticVersion.TryParse(tag.FriendlyName, context.Configuration.GitTagPrefix, out version))
{
continue;
}

allTags.Add(Tuple.Create(tag, version));
}

var allTags = GitRepoMetadataProvider.GetValidVersionTags(context.Repository, context.Configuration.GitTagPrefix, olderThan);

var tagsOnBranch = currentBranch
.Commits
.SelectMany(commit => { return allTags.Where(t => IsValidTag(t.Item1, commit)); })
Expand Down