Drop obsolete members after release v0.18.0

8 files changed, 0 insertions, 277 deletions

diff --git a/LibGit2Sharp/Branch.cs b/LibGit2Sharp/Branch.cs
index 1e64b8b9..6b5cb25c 100644
--- a/LibGit2Sharp/Branch.cs
+++ b/LibGit2Sharp/Branch.cs
@@ -225,33 +225,6 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Checkout the tip commit of this <see cref="Branch"/> object
-        /// with a callback for progress reporting. If this commit is the
-        /// current tip of the branch, will checkout the named branch. Otherwise,
-        /// will checkout the tip commit as a detached HEAD.
-        /// </summary>
-        /// <param name="checkoutModifiers">Options controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress">Callback method to report checkout progress updates through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        [Obsolete("This overload will be removed in the next release. Please use Branch.Checkout(CheckoutOptions, Signature) instead.")]
-        public virtual void Checkout(CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions)
-        {
-            var options = new CheckoutOptions
-            {
-                CheckoutModifiers = checkoutModifiers,
-                OnCheckoutProgress = onCheckoutProgress,
-            };
-
-            if (checkoutNotificationOptions != null)
-            {
-                options.OnCheckoutNotify = checkoutNotificationOptions.CheckoutNotifyHandler;
-                options.CheckoutNotifyFlags = checkoutNotificationOptions.NotifyFlags;
-            }
-
-            Checkout(options, null);
-        }
-
-        /// <summary>
         /// Checkout the tip commit of this <see cref="Branch"/> object with
         /// <see cref="CheckoutOptions"/> parameter specifying checkout
         /// behavior. If this commit is the current tip of the branch, will
diff --git a/LibGit2Sharp/BranchCollection.cs b/LibGit2Sharp/BranchCollection.cs
index d0951328..929661fe 100644
--- a/LibGit2Sharp/BranchCollection.cs
+++ b/LibGit2Sharp/BranchCollection.cs
@@ -196,21 +196,6 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Rename an existing local branch
-        /// </summary>
-        /// <param name="branch">The current local branch.</param>
-        /// <param name="newName">The new name the existing branch should bear.</param>
-        /// <param name="signature">Identity used for updating the reflog</param>
-        /// <param name="logMessage">Message added to the reflog. If null, the default is "branch: renamed [old] to [new]".</param>
-        /// <param name="allowOverwrite">True to allow silent overwriting a potentially existing branch, false otherwise.</param>
-        /// <returns>A new <see cref="Branch"/>.</returns>
-        [Obsolete("This will be removed in the next release. Please use BranchCollection.Rename(Branch, string, Signature, string, bool) instead.")]
-        public virtual Branch Move(Branch branch, string newName, Signature signature, string logMessage = null, bool allowOverwrite = false)
-        {
-            return Rename(branch, newName, signature, logMessage, allowOverwrite);
-        }
-
-        /// <summary>
         /// Rename an existing local branch, using the default reflog message
         /// </summary>
         /// <param name="branch">The current local branch.</param>
@@ -223,19 +208,6 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Rename an existing local branch, using the default reflog message
-        /// </summary>
-        /// <param name="branch">The current local branch.</param>
-        /// <param name="newName">The new name the existing branch should bear.</param>
-        /// <param name="allowOverwrite">True to allow silent overwriting a potentially existing branch, false otherwise.</param>
-        /// <returns>A new <see cref="Branch"/>.</returns>
-        [Obsolete("This will be removed in the next release. Please use BranchCollection.Rename(Branch, string, bool) instead.")]
-        public virtual Branch Move(Branch branch, string newName, bool allowOverwrite = false)
-        {
-            return Rename(branch, newName, allowOverwrite);
-        }
-
-        /// <summary>
         /// Update properties of a branch.
         /// </summary>
         /// <param name="branch">The branch to update.</param>
diff --git a/LibGit2Sharp/BranchCollectionExtensions.cs b/LibGit2Sharp/BranchCollectionExtensions.cs
index 4adebf68..7008eb6a 100644
--- a/LibGit2Sharp/BranchCollectionExtensions.cs
+++ b/LibGit2Sharp/BranchCollectionExtensions.cs
@@ -97,19 +97,5 @@ namespace LibGit2Sharp
 
             return branches.Rename(branch, newName, allowOverwrite);
         }
-
-        /// <summary>
-        /// Rename an existing local branch, using the default reflog message
-        /// </summary>
-        /// <param name="currentName">The current branch name.</param>
-        /// <param name="newName">The new name the existing branch should bear.</param>
-        /// <param name="allowOverwrite">True to allow silent overwriting a potentially existing branch, false otherwise.</param>
-        /// <param name="branches">The <see cref="BranchCollection"/> being worked with.</param>
-        /// <returns>A new <see cref="Branch"/>.</returns>
-        [Obsolete("This will be removed in the next release. Please use BranchCollection.Rename(string, string, bool) instead.")]
-        public static Branch Move(this BranchCollection branches, string currentName, string newName, bool allowOverwrite = false)
-        {
-            return Rename(branches, currentName, newName, allowOverwrite);
-        }
     }
 }
diff --git a/LibGit2Sharp/CheckoutNotificationOptions.cs b/LibGit2Sharp/CheckoutNotificationOptions.cs
index c1d0a167..26172715 100644
--- a/LibGit2Sharp/CheckoutNotificationOptions.cs
+++ b/LibGit2Sharp/CheckoutNotificationOptions.cs
@@ -41,40 +41,4 @@ namespace LibGit2Sharp
         /// </summary>
         Ignored = (1 << 4), /* GIT_CHECKOUT_NOTIFY_IGNORED */
     }
-
-    /// <summary>
-    /// Class to specify options and callback on CheckoutNotifications.
-    /// </summary>
-    [Obsolete("This class will be removed in the next release. Specify CheckoutNotification options through CheckoutOptions instead.")]
-    public class CheckoutNotificationOptions
-    {
-        /// <summary>
-        /// Needed for mocking purposes.
-        /// </summary>
-        protected CheckoutNotificationOptions()
-        {
-        }
-
-        /// <summary>
-        /// The delegate that will be called for files that match the
-        /// options specified in NotifyFlags.
-        /// </summary>
-        public virtual CheckoutNotifyHandler CheckoutNotifyHandler { get; private set; }
-
-        /// <summary>
-        /// The Flags specifying what notifications are reported.
-        /// </summary>
-        public virtual CheckoutNotifyFlags NotifyFlags { get; private set; }
-
-        /// <summary>
-        /// Construct the CheckoutNotificationOptions class.
-        /// </summary>
-        /// <param name="checkoutNotifyHandler"><see cref="CheckoutNotifyHandler"/> that checkout notifications are reported through.</param>
-        /// <param name="notifyFlags">The checkout notification type.</param>
-        public CheckoutNotificationOptions(CheckoutNotifyHandler checkoutNotifyHandler, CheckoutNotifyFlags notifyFlags)
-        {
-            CheckoutNotifyHandler = checkoutNotifyHandler;
-            NotifyFlags = notifyFlags;
-        }
-    }
 }
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs
index 3dbb6247..d948a23d 100644
--- a/LibGit2Sharp/IRepository.cs
+++ b/LibGit2Sharp/IRepository.cs
@@ -78,53 +78,6 @@ namespace LibGit2Sharp
         /// </para>
         /// </summary>
         /// <param name="branch">The <see cref="Branch"/> to check out.</param>
-        /// <param name="checkoutModifiers"><see cref="CheckoutModifiers"/> controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress"><see cref="CheckoutProgressHandler"/> that checkout progress is reported through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(Branch, CheckoutOptions, Signature) instead.")]
-        Branch Checkout(Branch branch, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions, Signature signature = null);
-
-        /// <summary>
-        /// Checkout the specified branch, reference or SHA.
-        /// <para>
-        ///   If the committishOrBranchSpec parameter resolves to a branch name, then the checked out HEAD will
-        ///   will point to the branch. Otherwise, the HEAD will be detached, pointing at the commit sha.
-        /// </para>
-        /// </summary>
-        /// <param name="committishOrBranchSpec">A revparse spec for the commit or branch to checkout.</param>
-        /// <param name="checkoutModifiers">Options controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress">Callback method to report checkout progress updates through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(string, CheckoutOptions, Signature) instead.")]
-        Branch Checkout(string committishOrBranchSpec, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions, Signature signature = null);
-
-        /// <summary>
-        /// Checkout the specified <see cref="LibGit2Sharp.Commit"/>.
-        /// <para>
-        ///   Will detach the HEAD and make it point to this commit sha.
-        /// </para>
-        /// </summary>
-        /// <param name="commit">The <see cref="LibGit2Sharp.Commit"/> to check out.</param>
-        /// <param name="checkoutModifiers"><see cref="CheckoutModifiers"/> controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress"><see cref="CheckoutProgressHandler"/> that checkout progress is reported through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(Commit, CheckoutOptions, Signature) instead.")]
-        Branch Checkout(Commit commit, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions, Signature signature = null);
-
-        /// <summary>
-        /// Checkout the commit pointed at by the tip of the specified <see cref="Branch"/>.
-        /// <para>
-        ///   If this commit is the current tip of the branch as it exists in the repository, the HEAD
-        ///   will point to this branch. Otherwise, the HEAD will be detached, pointing at the commit sha.
-        /// </para>
-        /// </summary>
-        /// <param name="branch">The <see cref="Branch"/> to check out.</param>
         /// <param name="options"><see cref="CheckoutOptions"/> controlling checkout behavior.</param>
         /// <param name="signature">Identity for use when updating the reflog.</param>
         /// <returns>The <see cref="Branch"/> that was checked out.</returns>
diff --git a/LibGit2Sharp/ReferenceCollection.cs b/LibGit2Sharp/ReferenceCollection.cs
index 95afe820..a6cf58c4 100644
--- a/LibGit2Sharp/ReferenceCollection.cs
+++ b/LibGit2Sharp/ReferenceCollection.cs
@@ -328,25 +328,6 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Determines if the proposed reference name is well-formed.
-        /// </summary>
-        /// <para>
-        /// - Top-level names must contain only capital letters and underscores,
-        /// and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
-        ///
-        /// - Names prefixed with "refs/" can be almost anything.  You must avoid
-        /// the characters '~', '^', ':', '\\', '?', '[', and '*', and the
-        /// sequences ".." and "@{" which have special meaning to revparse.
-        /// </para>
-        /// <param name="canonicalName">The name to be checked.</param>
-        /// <returns>true is the name is valid; false otherwise.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Reference.IsValidName(string) instead.")]
-        public virtual bool IsValidName(string canonicalName)
-        {
-            return Reference.IsValidName(canonicalName);
-        }
-
-        /// <summary>
         /// Shortcut to return the HEAD reference.
         /// </summary>
         /// <returns>
diff --git a/LibGit2Sharp/RemoteCollection.cs b/LibGit2Sharp/RemoteCollection.cs
index 443dc3f5..300ed8f7 100644
--- a/LibGit2Sharp/RemoteCollection.cs
+++ b/LibGit2Sharp/RemoteCollection.cs
@@ -127,17 +127,6 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Determines if the proposed remote name is well-formed.
-        /// </summary>
-        /// <param name="name">The name to be checked.</param>
-        /// <returns>true is the name is valid; false otherwise.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Remote.IsValidName(string) instead.")]
-        public virtual bool IsValidName(string name)
-        {
-            return Remote.IsValidName(name);
-        }
-
-        /// <summary>
         /// Deletes the <see cref="Remote"/> with the specified name.
         /// </summary>
         /// <param name="name">The name of the remote to remove.</param>
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 68d87e6f..f28f6fff 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -585,37 +585,6 @@ namespace LibGit2Sharp
         /// </para>
         /// </summary>
         /// <param name="committishOrBranchSpec">A revparse spec for the commit or branch to checkout.</param>
-        /// <param name="checkoutModifiers"><see cref="CheckoutModifiers"/> controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress"><see cref="CheckoutProgressHandler"/> that checkout progress is reported through.</param>
-        /// <param name="checkoutNotifications"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(string, CheckoutOptions, Signature) instead.")]
-        public Branch Checkout(string committishOrBranchSpec, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotifications, Signature signature = null)
-        {
-            var options = new CheckoutOptions()
-            {
-                CheckoutModifiers = checkoutModifiers,
-                OnCheckoutProgress = onCheckoutProgress
-            };
-
-            if (checkoutNotifications != null)
-            {
-                options.OnCheckoutNotify = checkoutNotifications.CheckoutNotifyHandler;
-                options.CheckoutNotifyFlags = checkoutNotifications.NotifyFlags;
-            }
-
-            return Checkout(committishOrBranchSpec, options, signature);
-        }
-
-        /// <summary>
-        /// Checkout the specified <see cref="Branch"/>, reference or SHA.
-        /// <para>
-        ///   If the committishOrBranchSpec parameter resolves to a branch name, then the checked out HEAD will
-        ///   will point to the branch. Otherwise, the HEAD will be detached, pointing at the commit sha.
-        /// </para>
-        /// </summary>
-        /// <param name="committishOrBranchSpec">A revparse spec for the commit or branch to checkout.</param>
         /// <param name="options"><see cref="CheckoutOptions"/> controlling checkout behavior.</param>
         /// <param name="signature">Identity for use when updating the reflog.</param>
         /// <returns>The <see cref="Branch"/> that was checked out.</returns>
@@ -666,37 +635,6 @@ namespace LibGit2Sharp
         /// as a detached HEAD.
         /// </summary>
         /// <param name="branch">The <see cref="Branch"/> to check out.</param>
-        /// <param name="checkoutModifiers"><see cref="CheckoutModifiers"/> controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress"><see cref="CheckoutProgressHandler"/> that checkout progress is reported through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(Branch, CheckoutOptions, Signature) instead.")]
-        public Branch Checkout(Branch branch, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions, Signature signature = null)
-        {
-            Ensure.ArgumentNotNull(branch, "branch");
-
-            var options = new CheckoutOptions
-               {
-                   CheckoutModifiers = checkoutModifiers,
-                   OnCheckoutProgress = onCheckoutProgress,
-               };
-
-            if (checkoutNotificationOptions != null)
-            {
-                options.OnCheckoutNotify = checkoutNotificationOptions.CheckoutNotifyHandler;
-                options.CheckoutNotifyFlags = checkoutNotificationOptions.NotifyFlags;
-            }
-
-            return Checkout(branch, options, signature);
-        }
-
-        /// <summary>
-        /// Checkout the tip commit of the specified <see cref="Branch"/> object. If this commit is the
-        /// current tip of the branch, will checkout the named branch. Otherwise, will checkout the tip commit
-        /// as a detached HEAD.
-        /// </summary>
-        /// <param name="branch">The <see cref="Branch"/> to check out.</param>
         /// <param name="options"><see cref="CheckoutOptions"/> controlling checkout behavior.</param>
         /// <param name="signature">Identity for use when updating the reflog.</param>
         /// <returns>The <see cref="Branch"/> that was checked out.</returns>
@@ -734,39 +672,6 @@ namespace LibGit2Sharp
         /// </para>
         /// </summary>
         /// <param name="commit">The <see cref="LibGit2Sharp.Commit"/> to check out.</param>
-        /// <param name="checkoutModifiers"><see cref="CheckoutModifiers"/> controlling checkout behavior.</param>
-        /// <param name="onCheckoutProgress"><see cref="CheckoutProgressHandler"/> that checkout progress is reported through.</param>
-        /// <param name="checkoutNotificationOptions"><see cref="CheckoutNotificationOptions"/> to manage checkout notifications.</param>
-        /// <param name="signature">Identity for use when updating the reflog.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This overload will be removed in the next release. Please use Repository.Checkout(Commit, CheckoutOptions, Signature) instead.")]
-        public Branch Checkout(Commit commit, CheckoutModifiers checkoutModifiers, CheckoutProgressHandler onCheckoutProgress, CheckoutNotificationOptions checkoutNotificationOptions, Signature signature = null)
-        {
-
-            var options = new CheckoutOptions
-            {
-                CheckoutModifiers = checkoutModifiers,
-                OnCheckoutProgress = onCheckoutProgress,
-            };
-
-            if (checkoutNotificationOptions != null)
-            {
-                options.OnCheckoutNotify = checkoutNotificationOptions.CheckoutNotifyHandler;
-                options.CheckoutNotifyFlags = checkoutNotificationOptions.NotifyFlags;
-            }
-
-            Checkout(commit.Tree, options, commit.Id.Sha, commit.Id.Sha, signature);
-
-            return Head;
-        }
-
-        /// <summary>
-        /// Checkout the specified <see cref="LibGit2Sharp.Commit"/>.
-        /// <para>
-        ///   Will detach the HEAD and make it point to this commit sha.
-        /// </para>
-        /// </summary>
-        /// <param name="commit">The <see cref="LibGit2Sharp.Commit"/> to check out.</param>
         /// <param name="options"><see cref="CheckoutOptions"/> controlling checkout behavior.</param>
         /// <param name="signature">Identity for use when updating the reflog.</param>
         /// <returns>The <see cref="Branch"/> that was checked out.</returns>