Skip to content
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.

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

Team changes #41

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aa22aac
1) foresee TeamChangesetProvider : get all not yet merged changesets.
RubenWillems Apr 20, 2018
3a65834
Initial split team and solo
DieterVantilt Apr 20, 2018
6adb43c
reworked teamChangesetProvider : removed hard coded test settings
RubenWillems Apr 20, 2018
8893a44
Merge conflict changes
DieterVantilt Apr 20, 2018
02f04db
Merge branch 'TeamChanges' of https://github.com/RubenWillems/AutoMer…
DieterVantilt Apr 20, 2018
30da8ab
Branch change set
DieterVantilt Apr 20, 2018
5f672fe
Choosing the source and target branch
DieterVantilt Apr 20, 2018
ab56d59
Implementation for the merging and adding all associated work items.
dieter-vantilt May 1, 2018
64b855c
nameof operator iso strings for raise event
RubenWillems May 3, 2018
9a9a740
Merge branch 'TeamChanges' of https://github.com/RubenWillems/AutoMer…
RubenWillems May 3, 2018
749bbf1
move providers into separate folder
RubenWillems May 3, 2018
bbdebe1
list tfs projects, list branches of project
RubenWillems May 3, 2018
cf4bd95
show all branches, --> recursionType Full
RubenWillems May 3, 2018
e431011
Adding button to fetch all changesets
DieterVantilt May 8, 2018
10138ac
Merge branch 'TeamChanges' of https://github.com/RubenWillems/AutoMer…
DieterVantilt May 8, 2018
d15fc40
dummy values for testing (remove later on)
RubenWillems May 17, 2018
610465c
fix merge
RubenWillems May 17, 2018
5fc01da
Project source en target branches
dieter-vantilt May 17, 2018
016a3f2
resolve conflicts
RubenWillems May 18, 2018
5bdf8c0
Change to target branch
DieterVantilt May 18, 2018
6b225fb
clean up code
RubenWillems May 18, 2018
c09eaa2
clean up code
RubenWillems May 18, 2018
b4fa7a7
set .Net target framework back to 4.6.2
RubenWillems Jun 15, 2018
38e9251
fix build ? removed newer C# syntax features
RubenWillems Jun 19, 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
Prev Previous commit
Next Next commit
reworked teamChangesetProvider : removed hard coded test settings
  • Loading branch information
RubenWillems committed Apr 20, 2018
commit 6adb43cc84ce1127e7430fabf46cecb6fd521a1f
15 changes: 7 additions & 8 deletions src/AutoMerge/RecentChangesets/TeamChangesetChangesetProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ namespace AutoMerge
{
public class TeamChangesetChangesetProvider : ChangesetProviderBase
{
private readonly int _maxChangesetCount;
private readonly string _branchLocation;
private readonly string _sourceBranch;
private readonly string _targetBranch;

public TeamChangesetChangesetProvider(IServiceProvider serviceProvider, string branchLocation, int maxChangesetCount) : base(serviceProvider)

public TeamChangesetChangesetProvider(IServiceProvider serviceProvider, string sourceBranch, string targetBranch) : base(serviceProvider)
{
_maxChangesetCount = maxChangesetCount;
_branchLocation = branchLocation;
_sourceBranch = sourceBranch;
_targetBranch = targetBranch;
}

protected override List<ChangesetViewModel> GetChangesetsInternal()
Expand All @@ -26,9 +27,7 @@ protected override List<ChangesetViewModel> GetChangesetsInternal()
if (changesetService != null)
{
var projectName = GetProjectName();
var tfsChangesets = changesetService.GetMergeCandidates("$/Test/Branches/B01", "$/Test/Main");

//var tfsChangesets = changesetService.GetTeamChangesets(projectName, _branchLocation, _maxChangesetCount);
var tfsChangesets = changesetService.GetMergeCandidates(_sourceBranch, _targetBranch);

changesets = tfsChangesets
.Select(tfsChangeset => ToChangesetViewModel(tfsChangeset, changesetService))
Expand Down
4 changes: 2 additions & 2 deletions src/AutoMerge/Services/ChangesetService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public Changeset GetChangeset(int changesetId)



public ICollection<Changeset> GetMergeCandidates(string tfsLocationFrom, string tfsLocationTo)
public ICollection<Changeset> GetMergeCandidates(string sourceBranch, string targetBranch)
{
var smos = _versionControlServer.GetMergeCandidates(tfsLocationFrom, tfsLocationTo, RecursionType.Full);
var smos = _versionControlServer.GetMergeCandidates(sourceBranch, targetBranch, RecursionType.Full);

List<Changeset> result = new List<Changeset>();

Expand Down