Fix merge

shana · shana · commit 4d0379198261 · 2017-11-01T19:42:29.000-07:00
diff --git a/src/GitHub.Api/Git/GitObjectFactory.cs b/src/GitHub.Api/Git/GitObjectFactory.cs
@@ -26,12 +26,7 @@ public GitLock CreateGitLock(string path, string user, int id)
             var npath = new NPath(path).MakeAbsolute();
             var fullPath = npath.RelativeTo(environment.RepositoryPath);
 
-            return new GitLock {
-                Path = path,
-                FullPath = fullPath,
-                User = user,
-                ID = id
-            };
+            return new GitLock(path, fullPath, user, id);
         }
     }
 }
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -465,14 +464,14 @@ private GitBranch GetLocalGitBranch(ConfigBranch x)
             var trackingName = x.IsTracking ? x.Remote.Value.Name + "/" + name : "[None]";
             var isActive = name == CurrentBranchName;
 
-            return new GitBranch { Name = name, Tracking = trackingName, IsActive = isActive };
+            return new GitBranch(name, trackingName, isActive);
         }
 
         private static GitBranch GetRemoteGitBranch(ConfigBranch x)
         {
             var name = x.Remote.Value.Name + "/" + x.Name;
 
-            return new GitBranch { Name = name };
+            return new GitBranch(name, "[None]", false);
         }
 
         private static GitRemote GetGitRemote(ConfigRemote configRemote)
diff --git a/src/GitHub.Api/OutputProcessors/BranchListOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/BranchListOutputProcessor.cs
@@ -36,12 +36,7 @@ public override void LineReceived(string line)
                 trackingName = proc.ReadChunk('[', ']');
             }
 
-            var branch = new GitBranch
-            {
-                Name = name,
-                Tracking = trackingName,
-                IsActive = active
-            };
+            var branch = new GitBranch(name, trackingName, active);
 
             RaiseOnEntry(branch);
         }
diff --git a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs
diff --git a/src/tests/IntegrationTests/Git/GitSetupTests.cs b/src/tests/IntegrationTests/Git/GitSetupTests.cs
@@ -63,16 +63,8 @@ public async Task InstallGit()
                 .StartAsAsync();
 
             gitBranches.Should().BeEquivalentTo(
-                new GitBranch {
-                    Name = "master",
-                    Tracking = "origin/master: behind 1",
-                    IsActive = true
-                },
-                new GitBranch {
-                    Name = "feature/document",
-                    Tracking = "origin/feature/document",
-                    IsActive = false
-                });
+                new GitBranch("master", "origin/master: behind 1", true),
+                new GitBranch("feature/document", "origin/feature/document", false));
         }
 
 
diff --git a/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs b/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs
@@ -23,16 +23,8 @@ public async Task BranchListTest()
                 .StartAsAsync();
 
             gitBranches.Should().BeEquivalentTo(
-                new GitBranch {
-                    Name = "master",
-                    Tracking = "origin/master: behind 1",
-                    IsActive = true
-                },
-                new GitBranch {
-                    Name = "feature/document",
-                    Tracking = "origin/feature/document",
-                    IsActive = false
-                });
+                new GitBranch("master", "origin/master: behind 1", true),
+                new GitBranch("feature/document", "origin/feature/document", false));
         }
 
         [Test]
diff --git a/src/tests/TestUtils/Substitutes/SubstituteFactory.cs b/src/tests/TestUtils/Substitutes/SubstituteFactory.cs
@@ -325,12 +325,7 @@ public IGitObjectFactory CreateGitObjectFactory(string gitRepoPath)
                 var user = (string)info[1];
                 var id = (int)info[2];
 
-                return new GitLock {
-                    Path = path,
-                    FullPath = gitRepoPath + @"\" + path,
-                    User = user,
-                    ID = id
-                };
+                return new GitLock(path, gitRepoPath + @"\" + path, user, id);
             });
 
             return gitObjectFactory;
diff --git a/src/tests/UnitTests/IO/BranchListOutputProcessorTests.cs b/src/tests/UnitTests/IO/BranchListOutputProcessorTests.cs
@@ -20,21 +20,9 @@ public void ShouldProcessOutput()
 
             AssertProcessOutput(output, new[]
             {
-                new GitBranch {
-                    Name = "master",
-                    Tracking = "origin/master",
-                    IsActive = true
-                },
-                new GitBranch {
-                    Name = "feature/feature-1",
-                    Tracking = "",
-                    IsActive = false
-                },
-                new GitBranch {
-                    Name = "bugfixes/bugfix-1",
-                    Tracking = "origin/bugfixes/bugfix-1",
-                    IsActive = false
-                },
+                new GitBranch("master", "origin/master", true),
+                new GitBranch("feature/feature-1", "", false),
+                new GitBranch("bugfixes/bugfix-1", "origin/bugfixes/bugfix-1", false),
             });
         }
 
diff --git a/src/tests/UnitTests/IO/LockOutputProcessorTests.cs b/src/tests/UnitTests/IO/LockOutputProcessorTests.cs
@@ -63,18 +63,8 @@ public void ShouldParseTwoLocksFormat1()
             };
 
             var expected = new[] {
-                new GitLock {
-                    Path = "folder/somefile.png",
-                    FullPath = TestRootPath + @"\folder/somefile.png",
-                    User = "GitHub User",
-                    ID = 12
-                },
-                new GitLock {
-                    Path = "somezip.zip",
-                    FullPath = TestRootPath + @"\somezip.zip",
-                    User = "GitHub User",
-                    ID = 21
-                }
+                new GitLock("folder/somefile.png", TestRootPath + @"\folder/somefile.png", "GitHub User", 12),
+                new GitLock("somezip.zip", TestRootPath + @"\somezip.zip", "GitHub User", 21)
             };
 
             AssertProcessOutput(output, expected);
@@ -91,18 +81,8 @@ public void ShouldParseTwoLocksFormat2()
             };
 
             var expected = new[] {
-                new GitLock {
-                    Path = "folder/somefile.png",
-                    FullPath = TestRootPath + @"\folder/somefile.png",
-                    User = "GitHub User",
-                    ID = 12
-                },
-                new GitLock {
-                    Path = "somezip.zip",
-                    FullPath = TestRootPath + @"\somezip.zip",
-                    User = "GitHub User",
-                    ID = 21
-                }
+                new GitLock("folder/somefile.png", TestRootPath + @"\folder/somefile.png", "GitHub User", 12),
+                new GitLock("somezip.zip", TestRootPath + @"\somezip.zip", "GitHub User", 21)
             };
 
             AssertProcessOutput(output, expected);
@@ -117,12 +97,7 @@ public void ShouldParseLocksOnFileWithNumericFirstLetter()
             };
 
             var expected = new[] {
-                new GitLock {
-                    Path = "2_TurtleDoves.jpg",
-                    FullPath = TestRootPath + @"\2_TurtleDoves.jpg",
-                    User = "Tree",
-                    ID = 100
-                }
+                new GitLock("2_TurtleDoves.jpg", TestRootPath + @"\2_TurtleDoves.jpg", "Tree", 100)
             };
 
             AssertProcessOutput(output, expected);

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,7 @@ public GitLock CreateGitLock(string path, string user, int id)`
`26`	`26`	`var npath = new NPath(path).MakeAbsolute();`
`27`	`27`	`var fullPath = npath.RelativeTo(environment.RepositoryPath);`
`28`	`28`
`29`		`- return new GitLock {`
`30`		`- Path = path,`
`31`		`- FullPath = fullPath,`
`32`		`- User = user,`
`33`		`- ID = id`
`34`		`- };`
	`29`	`+ return new GitLock(path, fullPath, user, id);`
`35`	`30`	`}`
`36`	`31`	`}`
`37`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Diagnostics;`
`5`	`4`	`using System.Globalization;`
`@@ -465,14 +464,14 @@ private GitBranch GetLocalGitBranch(ConfigBranch x)`
`465`	`464`	`var trackingName = x.IsTracking ? x.Remote.Value.Name + "/" + name : "[None]";`
`466`	`465`	`var isActive = name == CurrentBranchName;`
`467`	`466`
`468`		`- return new GitBranch { Name = name, Tracking = trackingName, IsActive = isActive };`
	`467`	`+ return new GitBranch(name, trackingName, isActive);`
`469`	`468`	`}`
`470`	`469`
`471`	`470`	`private static GitBranch GetRemoteGitBranch(ConfigBranch x)`
`472`	`471`	`{`
`473`	`472`	`var name = x.Remote.Value.Name + "/" + x.Name;`
`474`	`473`
`475`		`- return new GitBranch { Name = name };`
	`474`	`+ return new GitBranch(name, "[None]", false);`
`476`	`475`	`}`
`477`	`476`
`478`	`477`	`private static GitRemote GetGitRemote(ConfigRemote configRemote)`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,7 @@ public override void LineReceived(string line)`
`36`	`36`	`trackingName = proc.ReadChunk('[', ']');`
`37`	`37`	`}`
`38`	`38`
`39`		`- var branch = new GitBranch`
`40`		`- {`
`41`		`- Name = name,`
`42`		`- Tracking = trackingName,`
`43`		`- IsActive = active`
`44`		`- };`
	`39`	`+ var branch = new GitBranch(name, trackingName, active);`
`45`	`40`
`46`	`41`	`RaiseOnEntry(branch);`
`47`	`42`	`}`