Skip to content

Added branches in default config to GitVersion init branch list #933

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
JakeGinnivan merged 1 commit into from
Jul 10, 2016
Merged

Added branches in default config to GitVersion init branch list #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace GitVersion.Configuration.Init.SetConfig
using System;
using System.Collections.Generic;
using System.Linq;
using GitVersion.Configuration.Init.Wizard;
using Wizard;
using GitVersion.Helpers;

public class ConfigureBranches : ConfigInitWizardStep
Expand All @@ -26,7 +26,13 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
try
{
var foundBranch = OrderedBranches(config).ElementAt(parsed - 1);
steps.Enqueue(new ConfigureBranch(foundBranch.Key, foundBranch.Value, Console, FileSystem));
var branchConfig = foundBranch.Value;
if (branchConfig == null)
{
branchConfig = new BranchConfig();
config.Branches.Add(foundBranch.Key, branchConfig);
}
steps.Enqueue(new ConfigureBranch(foundBranch.Key, branchConfig, Console, FileSystem));
return StepResult.Ok();
}
catch (ArgumentOutOfRangeException)
Expand All @@ -46,7 +52,13 @@ protected override string GetPrompt(Config config, string workingDirectory)

static IOrderedEnumerable<KeyValuePair<string, BranchConfig>> OrderedBranches(Config config)
{
return config.Branches.OrderBy(b => b.Key);
var defaultConfig = new Config();
ConfigurationProvider.ApplyDefaultsTo(defaultConfig);
var defaultConfigurationBranches = defaultConfig.Branches
.Where(k => !config.Branches.ContainsKey(k.Key))
// Return an empty branch config
.Select(v => new KeyValuePair<string, BranchConfig>(v.Key, null));
return config.Branches.Union(defaultConfigurationBranches).OrderBy(b => b.Key);
}

protected override string DefaultResult
Expand Down