Skip to content

Commit 001b673

Browse files
author
roeil
committed
revert: mainline defer filtering of commits
1 parent e84e12b commit 001b673

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

src/GitVersion.Core/VersionCalculation/Mainline/MainlineContext.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44

55
namespace GitVersion.VersionCalculation.Mainline;
66

7-
internal record MainlineContext(IIncrementStrategyFinder IncrementStrategyFinder, IGitVersionConfiguration Configuration, IGitRepository Repository, GitVersionContext GitverContext)
7+
internal record MainlineContext(IIncrementStrategyFinder IncrementStrategyFinder, IGitVersionConfiguration Configuration)
88
{
99
public IIncrementStrategyFinder IncrementStrategyFinder { get; } = IncrementStrategyFinder.NotNull();
1010

1111
public IGitVersionConfiguration Configuration { get; } = Configuration.NotNull();
12-
public IGitRepository Repository { get; } = Repository.NotNull();
13-
public GitVersionContext GitverContext { get; } = GitverContext.NotNull();
1412

1513
public string? TargetLabel { get; init; }
1614

src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunkBase.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
1818
iteration: commit.ChildIteration,
1919
targetLabel: context.TargetLabel,
2020
incrementStrategyFinder: context.IncrementStrategyFinder,
21-
configuration: context.Configuration,
22-
repository: context.Repository,
23-
gitverContext: context.GitverContext
21+
configuration: context.Configuration
2422
);
2523

2624
context.Label ??= baseVersion.Operator?.Label;

src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunkBase.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
1616
iteration: commit.ChildIteration!,
1717
targetLabel: context.TargetLabel,
1818
incrementStrategyFinder: context.IncrementStrategyFinder,
19-
configuration: context.Configuration,
20-
repository: context.Repository,
21-
gitverContext: context.GitverContext
19+
configuration: context.Configuration
2220
);
2321

2422
context.Label ??= baseVersion.Operator?.Label;

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace GitVersion.VersionCalculation;
1111

1212
internal sealed class MainlineVersionStrategy(
1313
Lazy<GitVersionContext> contextLazy,
14-
IGitRepository repository,
1514
IRepositoryStore repositoryStore,
1615
ITaggedSemanticVersionService taggedSemanticVersionService,
1716
IIncrementStrategyFinder incrementStrategyFinder)
@@ -20,7 +19,6 @@ internal sealed class MainlineVersionStrategy(
2019
private volatile int iterationCounter;
2120
private readonly Lazy<GitVersionContext> contextLazy = contextLazy.NotNull();
2221
private readonly ITaggedSemanticVersionService taggedSemanticVersionService = taggedSemanticVersionService.NotNull();
23-
private readonly IGitRepository repository = repository.NotNull();
2422
private readonly IRepositoryStore repositoryStore = repositoryStore.NotNull();
2523
private readonly IIncrementStrategyFinder incrementStrategyFinder = incrementStrategyFinder.NotNull();
2624

@@ -325,16 +323,16 @@ private bool IterateOverCommitsRecursive(
325323
return result;
326324
}
327325

328-
private BaseVersion DetermineBaseVersion(MainlineIteration iteration, string? targetLabel,
326+
private static BaseVersion DetermineBaseVersion(MainlineIteration iteration, string? targetLabel,
329327
IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration)
330-
=> DetermineBaseVersionRecursive(iteration, targetLabel, incrementStrategyFinder, configuration, this.repository, this.Context);
328+
=> DetermineBaseVersionRecursive(iteration, targetLabel, incrementStrategyFinder, configuration);
331329

332330
internal static BaseVersion DetermineBaseVersionRecursive(MainlineIteration iteration, string? targetLabel,
333-
IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration, IGitRepository repository, GitVersionContext gitverContext)
331+
IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration)
334332
{
335333
iteration.NotNull();
336334

337-
var incrementSteps = GetIncrements(iteration, targetLabel, incrementStrategyFinder, configuration, repository, gitverContext).ToArray();
335+
var incrementSteps = GetIncrements(iteration, targetLabel, incrementStrategyFinder, configuration).ToArray();
338336

339337
BaseVersion? result = null;
340338
foreach (var baseVersionIncrement in incrementSteps)
@@ -357,20 +355,15 @@ internal static BaseVersion DetermineBaseVersionRecursive(MainlineIteration iter
357355
}
358356

359357
private static IEnumerable<IBaseVersionIncrement> GetIncrements(MainlineIteration iteration, string? targetLabel,
360-
IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration, IGitRepository repository, GitVersionContext gitverContext)
358+
IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration)
361359
{
362-
MainlineContext context = new(incrementStrategyFinder, configuration, repository, gitverContext)
360+
MainlineContext context = new(incrementStrategyFinder, configuration)
363361
{
364362
TargetLabel = targetLabel
365363
};
366364

367365
foreach (var commit in iteration.Commits)
368366
{
369-
if (configuration.Ignore.ToFilters(repository, gitverContext).OfType<PathFilter>().Any(f => f.Exclude(commit.Value, out _)))
370-
{
371-
continue;
372-
}
373-
374367
foreach (var item in TrunkContextPreEnricherCollection)
375368
{
376369
item.Enrich(iteration, commit, context);

0 commit comments

Comments
 (0)