From ea9b0d27b0d46344bedbcd7d474e340ab8f0ad00 Mon Sep 17 00:00:00 2001 From: Brendan's Test Account Date: Fri, 21 Mar 2014 11:12:57 +1300 Subject: [PATCH] dat code review feedback --- .../Clients/ObservableRepositoryCommitsClients.cs | 2 +- Octokit/Clients/RepositoryCommitsClient.cs | 2 +- Octokit/Helpers/ApiUrls.cs | 11 ++++++++--- Octokit/Models/Response/Commit.cs | 4 +--- Octokit/Models/Response/GitHubCommit.cs | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs b/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs index 996e2491..d7eb1b09 100644 --- a/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs +++ b/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs @@ -25,4 +25,4 @@ namespace Octokit.Reactive return _client.Repository.Commits.Compare(owner, name, @base, head).ToObservable(); } } -} \ No newline at end of file +} diff --git a/Octokit/Clients/RepositoryCommitsClient.cs b/Octokit/Clients/RepositoryCommitsClient.cs index 76f5b05b..6d741604 100644 --- a/Octokit/Clients/RepositoryCommitsClient.cs +++ b/Octokit/Clients/RepositoryCommitsClient.cs @@ -22,7 +22,7 @@ namespace Octokit public Task Compare(string owner, string name, string @base, string head) { Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); - Ensure.ArgumentNotNullOrEmptyString(name, "repositoryName"); + Ensure.ArgumentNotNullOrEmptyString(name, "name"); Ensure.ArgumentNotNullOrEmptyString(@base, "base"); Ensure.ArgumentNotNullOrEmptyString(head, "head"); diff --git a/Octokit/Helpers/ApiUrls.cs b/Octokit/Helpers/ApiUrls.cs index a39d09cd..2e3fe129 100644 --- a/Octokit/Helpers/ApiUrls.cs +++ b/Octokit/Helpers/ApiUrls.cs @@ -1053,15 +1053,20 @@ namespace Octokit /// Returns the for comparing two commits. /// /// The owner of the repository - /// The name of the repository + /// The name of the repository /// The base commit /// The head commit /// - public static Uri RepoCompare(string owner, string repositoryName, string @base, string head) + public static Uri RepoCompare(string owner, string name, string @base, string head) { + Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); + Ensure.ArgumentNotNullOrEmptyString(name, "name"); + Ensure.ArgumentNotNullOrEmptyString(@base, "base"); + Ensure.ArgumentNotNullOrEmptyString(head, "head"); + var encodedBase = @base.UriEncode(); var encodedHead = head.UriEncode(); - return "repos/{0}/{1}/compare/{2}...{3}".FormatUri(owner, repositoryName, encodedBase, encodedHead); + return "repos/{0}/{1}/compare/{2}...{3}".FormatUri(owner, name, encodedBase, encodedHead); } /// diff --git a/Octokit/Models/Response/Commit.cs b/Octokit/Models/Response/Commit.cs index c9b723a5..097b2dc9 100644 --- a/Octokit/Models/Response/Commit.cs +++ b/Octokit/Models/Response/Commit.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; namespace Octokit { diff --git a/Octokit/Models/Response/GitHubCommit.cs b/Octokit/Models/Response/GitHubCommit.cs index f2a4815f..31591039 100644 --- a/Octokit/Models/Response/GitHubCommit.cs +++ b/Octokit/Models/Response/GitHubCommit.cs @@ -16,4 +16,4 @@ namespace Octokit public string HtmlUrl { get; set; } public IReadOnlyList Parents { get; set; } } -} \ No newline at end of file +}