private static ITagResolver ResolveBranches(IEnumerable <Commit> commits, FileCollection includedFiles)
{
ITagResolver branchResolver;
var autoBranchResolver = new AutoBranchResolver(m_log, includedFiles)
{
PartialTagThreshold = m_config.PartialTagThreshold
};
branchResolver = autoBranchResolver;
// if we're matching branchpoints, resolve those tags first
if (m_config.BranchpointRule != null)
{
var tagResolver = new TagResolver(m_log, includedFiles)
{
PartialTagThreshold = m_config.PartialTagThreshold
};
var allBranches = includedFiles.SelectMany(f => f.AllBranches).Distinct();
var rule = m_config.BranchpointRule;
var branchpointTags = allBranches.Where(b => rule.IsMatch(b)).Select(b => rule.Apply(b));
if (!tagResolver.Resolve(branchpointTags, commits))
{
var unresolvedTags = tagResolver.UnresolvedTags.OrderBy(i => i);
m_log.WriteLine("Unresolved branchpoint tags:");
using (m_log.Indent())
{
foreach (var tag in unresolvedTags)
{
m_log.WriteLine("{0}", tag);
}
}
}
commits = tagResolver.Commits;
branchResolver = new ManualBranchResolver(m_log, autoBranchResolver, tagResolver, m_config.BranchpointRule);
}
// resolve remaining branchpoints
if (!branchResolver.Resolve(includedFiles.SelectMany(f => f.AllBranches).Distinct(), commits))
{
var unresolvedTags = branchResolver.UnresolvedTags.OrderBy(i => i);
m_log.WriteLine("Unresolved branches:");
using (m_log.Indent())
{
foreach (var tag in unresolvedTags)
{
m_log.WriteLine("{0}", tag);
}
}
throw new ImportFailedException(String.Format("Unable to resolve all branches to a single commit: {0}",
branchResolver.UnresolvedTags.StringJoin(", ")));
}
return(branchResolver);
}
private static ITagResolver ResolveBranches(IEnumerable<Commit> commits, FileCollection includedFiles)
{
ITagResolver branchResolver;
var autoBranchResolver = new AutoBranchResolver(m_log, includedFiles)
{
PartialTagThreshold = m_config.PartialTagThreshold
};
branchResolver = autoBranchResolver;
// if we're matching branchpoints, resolve those tags first
if (m_config.BranchpointRule != null)
{
var tagResolver = new TagResolver(m_log, includedFiles)
{
PartialTagThreshold = m_config.PartialTagThreshold
};
var allBranches = includedFiles.SelectMany(f => f.AllBranches).Distinct();
var rule = m_config.BranchpointRule;
var branchpointTags = allBranches.Where(b => rule.IsMatch(b)).Select(b => rule.Apply(b));
if (!tagResolver.Resolve(branchpointTags, commits))
{
var unresolvedTags = tagResolver.UnresolvedTags.OrderBy(i => i);
m_log.WriteLine("Unresolved branchpoint tags:");
using (m_log.Indent())
{
foreach (var tag in unresolvedTags)
m_log.WriteLine("{0}", tag);
}
}
commits = tagResolver.Commits;
branchResolver = new ManualBranchResolver(m_log, autoBranchResolver, tagResolver, m_config.BranchpointRule);
}
// resolve remaining branchpoints
if (!branchResolver.Resolve(includedFiles.SelectMany(f => f.AllBranches).Distinct(), commits))
{
var unresolvedTags = branchResolver.UnresolvedTags.OrderBy(i => i);
m_log.WriteLine("Unresolved branches:");
using (m_log.Indent())
{
foreach (var tag in unresolvedTags)
m_log.WriteLine("{0}", tag);
}
throw new ImportFailedException(String.Format("Unable to resolve all branches to a single commit: {0}",
branchResolver.UnresolvedTags.StringJoin(", ")));
}
return branchResolver;
}