Skip to content

Use nameof on arguments for Ensure #2143

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use nameof on arguments for Ensure #2143

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions LibGit2Sharp/Blob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public virtual Stream GetContentStream()
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
public virtual Stream GetContentStream(FilteringOptions filteringOptions)
{
Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
Ensure.ArgumentNotNull(filteringOptions, nameof(filteringOptions));

return Proxy.git_blob_filtered_content_stream(repo.Handle, Id, filteringOptions.HintPath, false);
}
Expand All @@ -86,7 +86,7 @@ public virtual string GetContentText()
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
public virtual string GetContentText(Encoding encoding)
{
Ensure.ArgumentNotNull(encoding, "encoding");
Ensure.ArgumentNotNull(encoding, nameof(encoding));

return ReadToEnd(GetContentStream(), encoding);
}
Expand Down Expand Up @@ -114,7 +114,7 @@ public virtual string GetContentText(FilteringOptions filteringOptions)
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
public virtual string GetContentText(FilteringOptions filteringOptions, Encoding encoding)
{
Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
Ensure.ArgumentNotNull(filteringOptions, nameof(filteringOptions));

return ReadToEnd(GetContentStream(filteringOptions), encoding);
}
Expand Down
20 changes: 10 additions & 10 deletions LibGit2Sharp/BranchCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public virtual Branch this[string name]
{
get
{
Ensure.ArgumentNotNullOrEmptyString(name, "name");
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));

if (LooksLikeABranchName(name))
{
Expand Down Expand Up @@ -138,7 +138,7 @@ public virtual Branch Add(string name, Commit commit)
/// <returns>A new <see cref="Branch"/>.</returns>
public virtual Branch Add(string name, Commit commit, bool allowOverwrite)
{
Ensure.ArgumentNotNull(commit, "commit");
Ensure.ArgumentNotNull(commit, nameof(commit));

return Add(name, commit.Sha, allowOverwrite);
}
Expand All @@ -152,8 +152,8 @@ public virtual Branch Add(string name, Commit commit, bool allowOverwrite)
/// <returns>A new <see cref="Branch"/>.</returns>
public virtual Branch Add(string name, string committish, bool allowOverwrite)
{
Ensure.ArgumentNotNullOrEmptyString(name, "name");
Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
Ensure.ArgumentNotNullOrEmptyString(committish, nameof(committish));

using (Proxy.git_branch_create_from_annotated(repo.Handle, name, committish, allowOverwrite))
{ }
Expand All @@ -178,7 +178,7 @@ public virtual void Remove(string name)
/// <param name="isRemote">True if the provided <paramref name="name"/> is the name of a remote branch, false otherwise.</param>
public virtual void Remove(string name, bool isRemote)
{
Ensure.ArgumentNotNullOrEmptyString(name, "name");
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));

string branchName = isRemote ? Reference.RemoteTrackingBranchPrefix + name : name;

Expand All @@ -197,7 +197,7 @@ public virtual void Remove(string name, bool isRemote)
/// <param name="branch">The branch to delete.</param>
public virtual void Remove(Branch branch)
{
Ensure.ArgumentNotNull(branch, "branch");
Ensure.ArgumentNotNull(branch, nameof(branch));

using (ReferenceHandle referencePtr = repo.Refs.RetrieveReferencePtr(branch.CanonicalName))
{
Expand Down Expand Up @@ -225,8 +225,8 @@ public virtual Branch Rename(string currentName, string newName)
/// <returns>A new <see cref="Branch"/>.</returns>
public virtual Branch Rename(string currentName, string newName, bool allowOverwrite)
{
Ensure.ArgumentNotNullOrEmptyString(currentName, "currentName");
Ensure.ArgumentNotNullOrEmptyString(newName, "newName");
Ensure.ArgumentNotNullOrEmptyString(currentName, nameof(currentName));
Ensure.ArgumentNotNullOrEmptyString(newName, nameof(newName));

Branch branch = this[currentName];

Expand Down Expand Up @@ -258,8 +258,8 @@ public virtual Branch Rename(Branch branch, string newName)
/// <returns>A new <see cref="Branch"/>.</returns>
public virtual Branch Rename(Branch branch, string newName, bool allowOverwrite)
{
Ensure.ArgumentNotNull(branch, "branch");
Ensure.ArgumentNotNullOrEmptyString(newName, "newName");
Ensure.ArgumentNotNull(branch, nameof(branch));
Ensure.ArgumentNotNullOrEmptyString(newName, nameof(newName));

if (branch.IsRemote)
{
Expand Down
4 changes: 2 additions & 2 deletions LibGit2Sharp/BranchUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ protected BranchUpdater()

internal BranchUpdater(Repository repo, Branch branch)
{
Ensure.ArgumentNotNull(repo, "repo");
Ensure.ArgumentNotNull(branch, "branch");
Ensure.ArgumentNotNull(repo, nameof(repo));
Ensure.ArgumentNotNull(branch, nameof(branch));

this.repo = repo;
this.branch = branch;
Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp/CloneOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public sealed class CloneOptions : IConvertableToGitCheckoutOpts
/// <param name="fetchOptions">The fetch options to use.</param>
public CloneOptions(FetchOptions fetchOptions) : this()
{
Ensure.ArgumentNotNull(fetchOptions, "fetchOptions");
Ensure.ArgumentNotNull(fetchOptions, nameof(fetchOptions));

FetchOptions = fetchOptions;
}
Expand Down
18 changes: 9 additions & 9 deletions LibGit2Sharp/Commands/Checkout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public static Branch Checkout(IRepository repository, string committishOrBranchS
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
public static Branch Checkout(IRepository repository, string committishOrBranchSpec, CheckoutOptions options)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNullOrEmptyString(committishOrBranchSpec, "committishOrBranchSpec");
Ensure.ArgumentNotNull(options, "options");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNullOrEmptyString(committishOrBranchSpec, nameof(committishOrBranchSpec));
Ensure.ArgumentNotNull(options, nameof(options));

Reference reference = null;
GitObject obj = null;
Expand Down Expand Up @@ -109,9 +109,9 @@ public static Branch Checkout(IRepository repository, Branch branch)
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
public static Branch Checkout(IRepository repository, Branch branch, CheckoutOptions options)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(branch, "branch");
Ensure.ArgumentNotNull(options, "options");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(branch, nameof(branch));
Ensure.ArgumentNotNull(options, nameof(options));

// Make sure this is not an unborn branch.
if (branch.Tip == null)
Expand Down Expand Up @@ -160,9 +160,9 @@ public static Branch Checkout(IRepository repository, Commit commit)
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
public static Branch Checkout(IRepository repository, Commit commit, CheckoutOptions options)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(commit, "commit");
Ensure.ArgumentNotNull(options, "options");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(commit, nameof(commit));
Ensure.ArgumentNotNull(options, nameof(options));

Checkout(repository, commit.Tree, options, commit.Id.Sha);

Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp/Commands/Fetch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private static RemoteHandle RemoteFromNameOrUrl(RepositoryHandle repoHandle, str
/// <param name="refspecs">List of refspecs to apply as active.</param>
public static void Fetch(Repository repository, string remote, IEnumerable<string> refspecs, FetchOptions options, string logMessage)
{
Ensure.ArgumentNotNull(remote, "remote");
Ensure.ArgumentNotNull(remote, nameof(remote));

options = options ?? new FetchOptions();
using (var remoteHandle = RemoteFromNameOrUrl(repository.Handle, remote))
Expand Down
4 changes: 2 additions & 2 deletions LibGit2Sharp/Commands/Pull.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public static partial class Commands
/// <param name="options">The options for fetch and merging.</param>
public static MergeResult Pull(Repository repository, Signature merger, PullOptions options)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(merger, "merger");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(merger, nameof(merger));


options = options ?? new PullOptions();
Expand Down
10 changes: 5 additions & 5 deletions LibGit2Sharp/Commands/Remove.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public static void Remove(IRepository repository, string path, bool removeFromWo
/// </param>
public static void Remove(IRepository repository, string path, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(path, nameof(path));

Remove(repository, new[] { path }, removeFromWorkingDirectory, explicitPathsOptions);
}
Expand Down Expand Up @@ -115,16 +115,16 @@ public static void Remove(IRepository repository, IEnumerable<string> paths)
/// </param>
public static void Remove(IRepository repository, IEnumerable<string> paths, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNullOrEmptyEnumerable<string>(paths, "paths");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNullOrEmptyEnumerable<string>(paths, nameof(paths));

var pathsToDelete = paths.Where(p => Directory.Exists(Path.Combine(repository.Info.WorkingDirectory, p))).ToList();
var notConflictedPaths = new List<string>();
var index = repository.Index;

foreach (var path in paths)
{
Ensure.ArgumentNotNullOrEmptyString(path, "path");
Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));

var conflict = index.Conflicts[path];

Expand Down
26 changes: 13 additions & 13 deletions LibGit2Sharp/Commands/Stage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public static partial class Commands
/// <param name="path">The path of the file within the working directory.</param>
public static void Stage(IRepository repository, string path)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(path, nameof(path));

Stage(repository, new[] { path }, null);
}
Expand All @@ -35,8 +35,8 @@ public static void Stage(IRepository repository, string path)
/// <param name="stageOptions">Determines how paths will be staged.</param>
public static void Stage(IRepository repository, string path, StageOptions stageOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(path, nameof(path));

Stage(repository, new[] { path }, stageOptions);
}
Expand All @@ -63,8 +63,8 @@ public static void Stage(IRepository repository, IEnumerable<string> paths)
/// <param name="stageOptions">Determines how paths will be staged.</param>
public static void Stage(IRepository repository, IEnumerable<string> paths, StageOptions stageOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(paths, "paths");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(paths, nameof(paths));

DiffModifiers diffModifiers = DiffModifiers.IncludeUntracked;
ExplicitPathsOptions explicitPathsOptions = stageOptions != null ? stageOptions.ExplicitPathsOptions : null;
Expand Down Expand Up @@ -160,8 +160,8 @@ public static void Unstage(IRepository repository, string path)
/// </param>
public static void Unstage(IRepository repository, string path, ExplicitPathsOptions explicitPathsOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(path, nameof(path));

Unstage(repository, new[] { path }, explicitPathsOptions);
}
Expand All @@ -187,8 +187,8 @@ public static void Unstage(IRepository repository, IEnumerable<string> paths)
/// </param>
public static void Unstage(IRepository repository, IEnumerable<string> paths, ExplicitPathsOptions explicitPathsOptions)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(paths, "paths");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(paths, nameof(paths));

if (repository.Info.IsHeadUnborn)
{
Expand Down Expand Up @@ -222,9 +222,9 @@ public static void Move(IRepository repository, string sourcePath, string destin
/// <param name="destinationPaths">The target paths of the files within the working directory.</param>
public static void Move(IRepository repository, IEnumerable<string> sourcePaths, IEnumerable<string> destinationPaths)
{
Ensure.ArgumentNotNull(repository, "repository");
Ensure.ArgumentNotNull(sourcePaths, "sourcePaths");
Ensure.ArgumentNotNull(destinationPaths, "destinationPaths");
Ensure.ArgumentNotNull(repository, nameof(repository));
Ensure.ArgumentNotNull(sourcePaths, nameof(sourcePaths));
Ensure.ArgumentNotNull(destinationPaths, nameof(destinationPaths));

//TODO: Move() should support following use cases:
// - Moving a file under a directory ('file' and 'dir' -> 'dir/file')
Expand Down
12 changes: 6 additions & 6 deletions LibGit2Sharp/Commit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ public static SignatureInfo ExtractSignature(Repository repo, ObjectId id)
/// <returns>The contents of the commit object.</returns>
public static string CreateBuffer(Signature author, Signature committer, string message, Tree tree, IEnumerable<Commit> parents, bool prettifyMessage, char? commentChar)
{
Ensure.ArgumentNotNull(message, "message");
Ensure.ArgumentDoesNotContainZeroByte(message, "message");
Ensure.ArgumentNotNull(author, "author");
Ensure.ArgumentNotNull(committer, "committer");
Ensure.ArgumentNotNull(tree, "tree");
Ensure.ArgumentNotNull(parents, "parents");
Ensure.ArgumentNotNull(message, nameof(message));
Ensure.ArgumentDoesNotContainZeroByte(message, nameof(message));
Ensure.ArgumentNotNull(author, nameof(author));
Ensure.ArgumentNotNull(committer, nameof(committer));
Ensure.ArgumentNotNull(tree, nameof(tree));
Ensure.ArgumentNotNull(parents, nameof(parents));

if (prettifyMessage)
{
Expand Down
12 changes: 6 additions & 6 deletions LibGit2Sharp/CommitLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ IEnumerator IEnumerable.GetEnumerator()
/// <returns>A list of commits, ready to be enumerated.</returns>
public ICommitLog QueryBy(CommitFilter filter)
{
Ensure.ArgumentNotNull(filter, "filter");
Ensure.ArgumentNotNull(filter.IncludeReachableFrom, "filter.IncludeReachableFrom");
Ensure.ArgumentNotNullOrEmptyString(filter.IncludeReachableFrom.ToString(), "filter.IncludeReachableFrom");
Ensure.ArgumentNotNull(filter, nameof(filter));
Ensure.ArgumentNotNull(filter.IncludeReachableFrom, nameof(filter.IncludeReachableFrom));
Ensure.ArgumentNotNullOrEmptyString(filter.IncludeReachableFrom.ToString(), nameof(filter.IncludeReachableFrom.ToString()));

return new CommitLog(repo, filter);
}
Expand All @@ -86,7 +86,7 @@ public ICommitLog QueryBy(CommitFilter filter)
/// <returns>A list of file history entries, ready to be enumerated.</returns>
public IEnumerable<LogEntry> QueryBy(string path)
{
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(path, nameof(path));

return new FileHistory(repo, path);
}
Expand All @@ -99,8 +99,8 @@ public IEnumerable<LogEntry> QueryBy(string path)
/// <returns>A list of file history entries, ready to be enumerated.</returns>
public IEnumerable<LogEntry> QueryBy(string path, CommitFilter filter)
{
Ensure.ArgumentNotNull(path, "path");
Ensure.ArgumentNotNull(filter, "filter");
Ensure.ArgumentNotNull(path, nameof(path));
Ensure.ArgumentNotNull(filter, nameof(filter));

return new FileHistory(repo, path, filter);
}
Expand Down
Loading