zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-06 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1048 from RobPethick/dev-IGitHubClientGitDatabaseToGit

Browse Source 
Switch GitDatabase->Git on IGitHubProvider
This commit is contained in:
Phil Haack
2016-01-02 14:46:00 -08:00
parent f85d8c4183 ffc0b35608
commit 87b460cbbc
25 changed files with 114 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Octokit.Reactive/Clients/ObservableBlobClient.cs
View File

@@ -11,7 +11,7 @@ namespace Octokit.Reactive
{
Ensure.ArgumentNotNull(client, "client");
_client = client.GitDatabase.Blob;
_client = client.Git.Blob;
}
/// <summary>

2
Octokit.Reactive/Clients/ObservableCommitsClient.cs
View File

@@ -10,7 +10,7 @@ namespace Octokit.Reactive
public ObservableCommitsClient(IGitHubClient client)
{
Ensure.ArgumentNotNull(client, "client");
_client = client.GitDatabase.Commit;
_client = client.Git.Commit;
}
/// <summary>

2
Octokit.Reactive/Clients/ObservableReferencesClient.cs
View File

@@ -14,7 +14,7 @@ namespace Octokit.Reactive
{
Ensure.ArgumentNotNull(client, "client");
_reference = client.GitDatabase.Reference;
_reference = client.Git.Reference;
_connection = client.Connection;
}

2
Octokit.Reactive/Clients/ObservableTagsClient.cs
View File

@@ -11,7 +11,7 @@ namespace Octokit.Reactive
{
Ensure.ArgumentNotNull(client, "client");
_client = client.GitDatabase.Tag;
_client = client.Git.Tag;
}
/// <summary>

2
Octokit.Reactive/Clients/ObservableTreesClient.cs
View File

@@ -11,7 +11,7 @@ namespace Octokit.Reactive
{
Ensure.ArgumentNotNull(client, "client");
_client = client.GitDatabase.Tree;
_client = client.Git.Tree;
}
/// <summary>

6
Octokit.Reactive/IObservableGitHubClient.cs
View File

@@ -1,4 +1,6 @@
namespace Octokit.Reactive
using System;
namespace Octokit.Reactive
{
public interface IObservableGitHubClient : IApiInfoProvider
{
@@ -18,6 +20,8 @@
IObservableUsersClient User { get; }
[System.Obsolete("Notifications are now available under the Activities client. This will be removed in a future update.")]
IObservableNotificationsClient Notification { get; }
IObservableGitDatabaseClient Git { get; }
[Obsolete("Use Git instead")]
IObservableGitDatabaseClient GitDatabase { get; }
IObservableSearchClient Search { get; }
}

6
Octokit.Reactive/ObservableGitHubClient.cs
View File

@@ -43,7 +43,7 @@ namespace Octokit.Reactive
SshKey = new ObservableSshKeysClient(gitHubClient);
User = new ObservableUsersClient(gitHubClient);
Release = new ObservableReleasesClient(gitHubClient);
GitDatabase = new ObservableGitDatabaseClient(gitHubClient);
Git = new ObservableGitDatabaseClient(gitHubClient);
Gist = new ObservableGistsClient(gitHubClient);
Search = new ObservableSearchClient(gitHubClient);
}
@@ -66,7 +66,9 @@ namespace Octokit.Reactive
public IObservableSshKeysClient SshKey { get; private set; }
public IObservableUsersClient User { get; private set; }
public IObservableNotificationsClient Notification { get; private set; }
public IObservableGitDatabaseClient GitDatabase { get; private set; }
[Obsolete("Use Git instead")]
public IObservableGitDatabaseClient GitDatabase { get { return Git; } }
public IObservableGitDatabaseClient Git { get; private set; }
public IObservableSearchClient Search { get; private set; }
/// <summary>

2
Octokit.Tests.Integration/Clients/BlobClientTests.cs
View File

@@ -14,7 +14,7 @@ public class BlobClientTests : IDisposable
public BlobClientTests()
{
var github = Helper.GetAuthenticatedClient();
_fixture = github.GitDatabase.Blob;
_fixture = github.Git.Blob;
_context = github.CreateRepositoryContext("public-repo").Result;
}

6
Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs
View File

@@ -167,7 +167,7 @@ public class CommitStatusClientTests
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var blobResult = await client.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var blobResult = await client.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -178,11 +178,11 @@ public class CommitStatusClientTests
Sha = blobResult.Sha
});
var treeResult = await client.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var treeResult = await client.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var newCommit = new NewCommit("test-commit", treeResult.Sha);
return await client.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
return await client.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
}
public void Dispose()

6
Octokit.Tests.Integration/Clients/CommitsClientTests.cs
View File

@@ -13,7 +13,7 @@ public class CommitsClientTests
public async Task CanCreateAndRetrieveCommit()
{
var github = Helper.GetAuthenticatedClient();
var fixture = github.GitDatabase.Commit;
var fixture = github.Git.Commit;
using (var context = await github.CreateRepositoryContext("public-repo"))
{
@@ -24,7 +24,7 @@ public class CommitsClientTests
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var blobResult = await github.GitDatabase.Blob.Create(owner, context.Repository.Name, blob);
var blobResult = await github.Git.Blob.Create(owner, context.Repository.Name, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -35,7 +35,7 @@ public class CommitsClientTests
Sha = blobResult.Sha
});
var treeResult = await github.GitDatabase.Tree.Create(owner, context.Repository.Name, newTree);
var treeResult = await github.Git.Tree.Create(owner, context.Repository.Name, newTree);
var newCommit = new NewCommit("test-commit", treeResult.Sha);

6
Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
View File

@@ -24,7 +24,7 @@ public class DeploymentStatusClientTests : IDisposable
Encoding = EncodingType.Utf8
};
var blobResult = github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob).Result;
var blobResult = github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob).Result;
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -35,10 +35,10 @@ public class DeploymentStatusClientTests : IDisposable
Sha = blobResult.Sha
});
var treeResult = github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree).Result;
var treeResult = github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree).Result;
var newCommit = new NewCommit("test-commit", treeResult.Sha);
var commit = github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
var commit = github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
var newDeployment = new NewDeployment(commit.Sha) { AutoMerge = false };
_deployment = _deploymentsClient.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployment).Result;

6
Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs
View File

@@ -24,7 +24,7 @@ public class DeploymentsClientTests : IDisposable
Encoding = EncodingType.Utf8
};
var blobResult = github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob).Result;
var blobResult = github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob).Result;
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -35,9 +35,9 @@ public class DeploymentsClientTests : IDisposable
Sha = blobResult.Sha
});
var treeResult = github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree).Result;
var treeResult = github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree).Result;
var newCommit = new NewCommit("test-commit", treeResult.Sha);
_commit = github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
_commit = github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
}
[IntegrationTest]

12
Octokit.Tests.Integration/Clients/MergingClientTests.cs
View File

@@ -40,21 +40,21 @@ public class MergingClientTests : IDisposable
async Task CreateTheWorld()
{
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
// create new commit for master branch
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World! I want to be overwritten by featurebranch!" } });
var newMaster = await CreateCommit("baseline for merge", newMasterTree.Sha, master.Object.Sha);
// update master
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
// create new commit for feature branch
var featureBranchTree = await CreateTree(new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something new" } });
var featureBranchCommit = await CreateCommit("this is the commit to merge", featureBranchTree.Sha, newMaster.Sha);
// create branch
await _github.GitDatabase.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
await _github.Git.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
}
async Task<TreeResponse> CreateTree(IEnumerable<KeyValuePair<string, string>> treeContents)
@@ -68,7 +68,7 @@ public class MergingClientTests : IDisposable
Content = c.Value,
Encoding = EncodingType.Utf8
};
var baselineBlobResult = await _github.GitDatabase.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
var baselineBlobResult = await _github.Git.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
collection.Add(new NewTreeItem
{
@@ -85,13 +85,13 @@ public class MergingClientTests : IDisposable
newTree.Tree.Add(item);
}
return await _github.GitDatabase.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
return await _github.Git.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
}
async Task<Commit> CreateCommit(string message, string sha, string parent)
{
var newCommit = new NewCommit(message, sha, parent);
return await _github.GitDatabase.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
return await _github.Git.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
}
public void Dispose()

12
Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs
View File

@@ -235,7 +235,7 @@ public class PullRequestReviewCommentsClientTests : IDisposable
// Creating a branch
var newBranch = new NewReference(branchRef, createdCommitInMaster.Sha);
await _github.GitDatabase.Reference.Create(Helper.UserName, repoName, newBranch);
await _github.Git.Reference.Create(Helper.UserName, repoName, newBranch);
// Creating a commit in the branch
@@ -264,7 +264,7 @@ public class PullRequestReviewCommentsClientTests : IDisposable
Encoding = EncodingType.Utf8
};
var createdBlob = await _github.GitDatabase.Blob.Create(Helper.UserName, repoName, blob);
var createdBlob = await _github.Git.Blob.Create(Helper.UserName, repoName, blob);
// Creating a tree
var newTree = new NewTree();
@@ -276,15 +276,15 @@ public class PullRequestReviewCommentsClientTests : IDisposable
Sha = createdBlob.Sha,
});
var createdTree = await _github.GitDatabase.Tree.Create(Helper.UserName, repoName, newTree);
var createdTree = await _github.Git.Tree.Create(Helper.UserName, repoName, newTree);
var treeSha = createdTree.Sha;
// Creating a commit
var parent = await _github.GitDatabase.Reference.Get(Helper.UserName, repoName, reference);
var parent = await _github.Git.Reference.Get(Helper.UserName, repoName, reference);
var commit = new NewCommit(commitMessage, treeSha, parent.Object.Sha);
var createdCommit = await _github.GitDatabase.Commit.Create(Helper.UserName, repoName, commit);
await _github.GitDatabase.Reference.Update(Helper.UserName, repoName, reference, new ReferenceUpdate(createdCommit.Sha));
var createdCommit = await _github.Git.Commit.Create(Helper.UserName, repoName, commit);
await _github.Git.Reference.Update(Helper.UserName, repoName, reference, new ReferenceUpdate(createdCommit.Sha));
return createdCommit;
}

24
Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
View File

@@ -244,10 +244,10 @@ public class PullRequestsClientTests : IDisposable
{
await CreateTheWorld();
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World, we meet again!" } });
var masterCommit = await CreateCommit("Commit in master", newMasterTree.Sha, master.Object.Sha);
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(masterCommit.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(masterCommit.Sha));
var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
@@ -275,7 +275,7 @@ public class PullRequestsClientTests : IDisposable
var merge = new MergePullRequest { CommitMessage = "thing the thing" };
var result = await _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge);
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
Assert.Equal(result.Sha, master.Object.Sha);
}
@@ -306,11 +306,11 @@ public class PullRequestsClientTests : IDisposable
const string commitMessage = "Another commit in branch";
var branch = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/" + branchName);
var branch = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/" + branchName);
var newTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World!" } });
var newCommit = await CreateCommit(commitMessage, newTree.Sha, branch.Object.Sha);
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/" + branchName, new ReferenceUpdate(newCommit.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/" + branchName, new ReferenceUpdate(newCommit.Sha));
await _repositoryCommentsClient.Create(Helper.UserName, _context.RepositoryName, newCommit.Sha, new NewCommitComment("I am a nice comment") { Path = "README.md", Position = 1 });
@@ -352,26 +352,26 @@ public class PullRequestsClientTests : IDisposable
async Task CreateTheWorld()
{
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
// create new commit for master branch
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World!" } });
var newMaster = await CreateCommit("baseline for pull request", newMasterTree.Sha, master.Object.Sha);
// update master
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
// create new commit for feature branch
var featureBranchTree = await CreateTree(new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something new" } });
var featureBranchCommit = await CreateCommit("this is the commit to merge into the pull request", featureBranchTree.Sha, newMaster.Sha);
// create branch
await _github.GitDatabase.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
await _github.Git.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
var otherFeatureBranchTree = await CreateTree(new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something else" } });
var otherFeatureBranchCommit = await CreateCommit("this is the other commit to merge into the other pull request", otherFeatureBranchTree.Sha, newMaster.Sha);
await _github.GitDatabase.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-other-branch", otherFeatureBranchCommit.Sha));
await _github.Git.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-other-branch", otherFeatureBranchCommit.Sha));
}
async Task<TreeResponse> CreateTree(IEnumerable<KeyValuePair<string, string>> treeContents)
@@ -385,7 +385,7 @@ public class PullRequestsClientTests : IDisposable
Content = c.Value,
Encoding = EncodingType.Utf8
};
var baselineBlobResult = await _github.GitDatabase.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
var baselineBlobResult = await _github.Git.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
collection.Add(new NewTreeItem
{
@@ -402,13 +402,13 @@ public class PullRequestsClientTests : IDisposable
newTree.Tree.Add(item);
}
return await _github.GitDatabase.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
return await _github.Git.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
}
async Task<Commit> CreateCommit(string message, string sha, string parent)
{
var newCommit = new NewCommit(message, sha, parent);
return await _github.GitDatabase.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
return await _github.Git.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
}
public void Dispose()

26
Octokit.Tests.Integration/Clients/ReferencesClientTests.cs
View File

@@ -17,7 +17,7 @@ public class ReferencesClientTests : IDisposable
{
_github = Helper.GetAuthenticatedClient();
_fixture = _github.GitDatabase.Reference;
_fixture = _github.Git.Reference;
_context = _github.CreateRepositoryContext("public-repo").Result;
}
@@ -77,7 +77,7 @@ public class ReferencesClientTests : IDisposable
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var blobResult = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var blobResult = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -88,11 +88,11 @@ public class ReferencesClientTests : IDisposable
Sha = blobResult.Sha
});
var treeResult = await _github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var treeResult = await _github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var newCommit = new NewCommit("This is a new commit", treeResult.Sha);
var commitResult = await _github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
var commitResult = await _github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
var newReference = new NewReference("heads/develop", commitResult.Sha);
var result = await _fixture.Create(_context.RepositoryOwner, _context.RepositoryName, newReference);
@@ -108,13 +108,13 @@ public class ReferencesClientTests : IDisposable
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var firstBlobResult = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, firstBlob);
var firstBlobResult = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, firstBlob);
var secondBlob = new NewBlob
{
Content = "This is a test!",
Encoding = EncodingType.Utf8
};
var secondBlobResult = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, secondBlob);
var secondBlobResult = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, secondBlob);
var firstTree = new NewTree();
firstTree.Tree.Add(new NewTreeItem
@@ -125,9 +125,9 @@ public class ReferencesClientTests : IDisposable
Sha = firstBlobResult.Sha
});
var firstTreeResult = await _github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, firstTree);
var firstTreeResult = await _github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, firstTree);
var firstCommit = new NewCommit("This is a new commit", firstTreeResult.Sha);
var firstCommitResult = await _github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, firstCommit);
var firstCommitResult = await _github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, firstCommit);
var newReference = new NewReference("heads/develop", firstCommitResult.Sha);
await _fixture.Create(_context.RepositoryOwner, _context.RepositoryName, newReference);
@@ -141,10 +141,10 @@ public class ReferencesClientTests : IDisposable
Sha = secondBlobResult.Sha
});
var secondTreeResult = await _github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, secondTree);
var secondTreeResult = await _github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, secondTree);
var secondCommit = new NewCommit("This is a new commit", secondTreeResult.Sha, firstCommitResult.Sha);
var secondCommitResult = await _github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, secondCommit);
var secondCommitResult = await _github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, secondCommit);
var referenceUpdate = new ReferenceUpdate(secondCommitResult.Sha);
@@ -161,7 +161,7 @@ public class ReferencesClientTests : IDisposable
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var blobResult = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var blobResult = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -172,11 +172,11 @@ public class ReferencesClientTests : IDisposable
Sha = blobResult.Sha
});
var treeResult = await _github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var treeResult = await _github.Git.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree);
var newCommit = new NewCommit("This is a new commit", treeResult.Sha);
var commitResult = await _github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
var commitResult = await _github.Git.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit);
var newReference = new NewReference("heads/develop", commitResult.Sha);

16
Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
View File

@@ -148,8 +148,8 @@ public class RepositoryCommitsClientTests
{
await CreateTheWorld();
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var branch = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/my-branch");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var branch = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/my-branch");
var result = await _fixture.Compare(Helper.UserName, _context.RepositoryName, master.Object.Sha, branch.Object.Sha);
@@ -160,21 +160,21 @@ public class RepositoryCommitsClientTests
async Task CreateTheWorld()
{
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
// create new commit for master branch
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World!" } });
var newMaster = await CreateCommit("baseline for pull request", newMasterTree.Sha, master.Object.Sha);
// update master
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
// create new commit for feature branch
var featureBranchTree = await CreateTree(new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something new" } });
var newFeature = await CreateCommit("this is the commit to merge into the pull request", featureBranchTree.Sha, newMaster.Sha);
// create branch
await _github.GitDatabase.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", newFeature.Sha));
await _github.Git.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", newFeature.Sha));
}
async Task<TreeResponse> CreateTree(IDictionary<string, string> treeContents)
@@ -188,7 +188,7 @@ public class RepositoryCommitsClientTests
Content = c.Value,
Encoding = EncodingType.Utf8
};
var baselineBlobResult = await _github.GitDatabase.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
var baselineBlobResult = await _github.Git.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
collection.Add(new NewTreeItem
{
@@ -205,13 +205,13 @@ public class RepositoryCommitsClientTests
newTree.Tree.Add(item);
}
return await _github.GitDatabase.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
return await _github.Git.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
}
async Task<Commit> CreateCommit(string message, string sha, string parent)
{
var newCommit = new NewCommit(message, sha, parent);
return await _github.GitDatabase.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
return await _github.Git.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
}
public void Dispose()

6
Octokit.Tests.Integration/Clients/StatisticsClientTests.cs
View File

@@ -13,7 +13,7 @@ namespace Octokit.Tests.Integration.Clients
public StatisticsClientTests()
{
_client = Helper.GetAuthenticatedClient();
_fixture = _client.GitDatabase.Commit;
_fixture = _client.Git.Commit;
}
[IntegrationTest]
@@ -115,7 +115,7 @@ namespace Octokit.Tests.Integration.Clients
Content = "Hello World!",
Encoding = EncodingType.Utf8
};
var blobResult = await _client.GitDatabase.Blob.Create(owner, repository, blob);
var blobResult = await _client.Git.Blob.Create(owner, repository, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -126,7 +126,7 @@ namespace Octokit.Tests.Integration.Clients
Sha = blobResult.Sha
});
var treeResult = await _client.GitDatabase.Tree.Create(owner, repository, newTree);
var treeResult = await _client.Git.Tree.Create(owner, repository, newTree);
var newCommit = new NewCommit("test-commit", treeResult.Sha);

6
Octokit.Tests.Integration/Clients/TreeClientTests.cs
View File

@@ -15,7 +15,7 @@ public class TreeClientTests : IDisposable
{
_github = Helper.GetAuthenticatedClient();
_fixture = _github.GitDatabase.Tree;
_fixture = _github.Git.Tree;
_context = _github.CreateRepositoryContext("public-repo").Result;
}
@@ -29,7 +29,7 @@ public class TreeClientTests : IDisposable
Encoding = EncodingType.Utf8
};
var createdBlob = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var createdBlob = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem
@@ -63,7 +63,7 @@ public class TreeClientTests : IDisposable
Encoding = EncodingType.Utf8
};
var blobResult = await _github.GitDatabase.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var blobResult = await _github.Git.Blob.Create(_context.RepositoryOwner, _context.RepositoryName, blob);
var newTree = new NewTree();
newTree.Tree.Add(new NewTreeItem

12
Octokit.Tests.Integration/Helpers/RepositorySetupHelper.cs
View File

@@ -16,7 +16,7 @@ namespace Octokit.Tests.Integration.Helpers
Content = c.Value,
Encoding = EncodingType.Utf8
};
var baselineBlobResult = await client.GitDatabase.Blob.Create(repository.Owner.Login, repository.Name, baselineBlob);
var baselineBlobResult = await client.Git.Blob.Create(repository.Owner.Login, repository.Name, baselineBlob);
collection.Add(new NewTreeItem
{
@@ -33,32 +33,32 @@ namespace Octokit.Tests.Integration.Helpers
newTree.Tree.Add(item);
}
return await client.GitDatabase.Tree.Create(repository.Owner.Login, repository.Name, newTree);
return await client.Git.Tree.Create(repository.Owner.Login, repository.Name, newTree);
}
public static async Task<Commit> CreateCommit(this IGitHubClient client, Repository repository, string message, string sha, string parent)
{
var newCommit = new NewCommit(message, sha, parent);
return await client.GitDatabase.Commit.Create(repository.Owner.Login, repository.Name, newCommit);
return await client.Git.Commit.Create(repository.Owner.Login, repository.Name, newCommit);
}
public static async Task<Reference> CreateTheWorld(this IGitHubClient client, Repository repository)
{
var master = await client.GitDatabase.Reference.Get(repository.Owner.Login, repository.Name, "heads/master");
var master = await client.Git.Reference.Get(repository.Owner.Login, repository.Name, "heads/master");
// create new commit for master branch
var newMasterTree = await client.CreateTree(repository, new Dictionary<string, string> { { "README.md", "Hello World!" } });
var newMaster = await client.CreateCommit(repository, "baseline for pull request", newMasterTree.Sha, master.Object.Sha);
// update master
await client.GitDatabase.Reference.Update(repository.Owner.Login, repository.Name, "heads/master", new ReferenceUpdate(newMaster.Sha));
await client.Git.Reference.Update(repository.Owner.Login, repository.Name, "heads/master", new ReferenceUpdate(newMaster.Sha));
// create new commit for feature branch
var featureBranchTree = await client.CreateTree(repository, new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something new" } });
var featureBranchCommit = await client.CreateCommit(repository, "this is the commit to merge into the pull request", featureBranchTree.Sha, newMaster.Sha);
// create branch
return await client.GitDatabase.Reference.Create(repository.Owner.Login, repository.Name, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
return await client.Git.Reference.Create(repository.Owner.Login, repository.Name, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
}
}
}

4
Octokit.Tests/Reactive/ObservableBlobClientTests.cs
View File

@@ -21,7 +21,7 @@ namespace Octokit.Tests.Reactive
client.Get("fake", "repo", "123456ABCD");
gitHubClient.GitDatabase.Blob.Received().Get("fake", "repo", "123456ABCD");
gitHubClient.Git.Blob.Received().Get("fake", "repo", "123456ABCD");
}
[Fact]
@@ -49,7 +49,7 @@ namespace Octokit.Tests.Reactive
client.Create("fake", "repo", newBlob);
gitHubClient.GitDatabase.Blob.Received().Create("fake", "repo", newBlob);
gitHubClient.Git.Blob.Received().Create("fake", "repo", newBlob);
}
[Fact]

4
Octokit.Tests/Reactive/ObservableCommitsClientTests.cs
View File

@@ -44,7 +44,7 @@ namespace Octokit.Tests.Reactive
client.Get("owner", "name", "reference");
gitHubClient.GitDatabase.Commit.Received(1).Get("owner", "name", "reference");
gitHubClient.Git.Commit.Received(1).Get("owner", "name", "reference");
}
}
@@ -72,7 +72,7 @@ namespace Octokit.Tests.Reactive
client.Create("owner", "name", newCommit);
gitHubClient.GitDatabase.Commit.Received().Create("owner", "name", newCommit);
gitHubClient.Git.Commit.Received().Create("owner", "name", newCommit);
}
}
}

6
Octokit.Tests/Reactive/ObservableTreesClientTests.cs
View File

@@ -21,7 +21,7 @@ namespace Octokit.Tests
client.Get("fake", "repo", "123456ABCD");
gitHubClient.GitDatabase.Tree.Received().Get("fake", "repo", "123456ABCD");
gitHubClient.Git.Tree.Received().Get("fake", "repo", "123456ABCD");
}
[Fact]
@@ -48,7 +48,7 @@ namespace Octokit.Tests
client.GetRecursive("fake", "repo", "123456ABCD");
gitHubClient.GitDatabase.Tree.Received().GetRecursive("fake", "repo", "123456ABCD");
gitHubClient.Git.Tree.Received().GetRecursive("fake", "repo", "123456ABCD");
}
[Fact]
@@ -76,7 +76,7 @@ namespace Octokit.Tests
client.Create("fake", "repo", newTree);
gitHubClient.GitDatabase.Tree.Received().Create("fake", "repo", newTree);
gitHubClient.Git.Tree.Received().Create("fake", "repo", newTree);
}
[Fact]

13
Octokit/GitHubClient.cs
View File

@@ -95,7 +95,7 @@ namespace Octokit
Release = new ReleasesClient(apiConnection);
User = new UsersClient(apiConnection);
SshKey = new SshKeysClient(apiConnection);
GitDatabase = new GitDatabaseClient(apiConnection);
Git = new GitDatabaseClient(apiConnection);
Search = new SearchClient(apiConnection);
Deployment = new DeploymentsClient(apiConnection);
}
@@ -257,7 +257,16 @@ namespace Octokit
/// <remarks>
/// Refer to the API docmentation for more information: https://developer.github.com/v3/git/
/// </remarks>
public IGitDatabaseClient GitDatabase { get; private set; }
[Obsolete("Use Git instead")]
public IGitDatabaseClient GitDatabase { get { return Git; } }
/// <summary>
/// Access GitHub's Git Data API.
/// </summary>
/// <remarks>
/// Refer to the API docmentation for more information: https://developer.github.com/v3/git/
/// </remarks>
public IGitDatabaseClient Git { get; private set; }
/// <summary>
/// Access GitHub's Search API.

13
Octokit/IGitHubClient.cs
View File

@@ -1,4 +1,6 @@
namespace Octokit
using System;
namespace Octokit
{
/// <summary>
/// A Client for the GitHub API v3. You can read more about the api here: http://developer.github.com.
@@ -125,8 +127,17 @@
/// <remarks>
/// Refer to the API docmentation for more information: https://developer.github.com/v3/git/
/// </remarks>
[Obsolete("Use Git instead")]
IGitDatabaseClient GitDatabase { get; }
/// <summary>
/// Access GitHub's Git Data API.
/// </summary>
/// <remarks>
/// Refer to the API docmentation for more information: https://developer.github.com/v3/git/
/// </remarks>
IGitDatabaseClient Git { get; }
/// <summary>
/// Access GitHub's Search API.
/// </summary>