Merge pull request #1461 from libgit2/ethomson/deprecations

Remove deprecated methods

Author: ethomson

LibGit2Sharp.Tests/RepositoryOptionsFixture.cs

@@ -55,7 +55,7 @@ public void CanOpenABareRepoAsIfItWasAStandardOneWithANonExisitingIndexFile()
         [Fact]
         public void CanOpenABareRepoWithOptions()
         {
-            var options = new RepositoryOptions { GlobalConfigurationLocation = null };
+            var options = new RepositoryOptions { };
 
             string path = SandboxBareTestRepo();
             using (var repo = new Repository(path, options))
@@ -153,45 +153,6 @@ private string MeanwhileInAnotherDimensionAnEvilMastermindIsAtWork(string workin
             }
         }
 
-        [Fact]
-        public void CanProvideDifferentConfigurationFilesToARepository()
-        {
-            string globalLocation = Path.Combine(newWorkdir, "my-global-config");
-            string xdgLocation = Path.Combine(newWorkdir, "my-xdg-config");
-            string systemLocation = Path.Combine(newWorkdir, "my-system-config");
-
-            const string name = "Adam 'aroben' Roben";
-            const string email = "adam@github.com";
-
-            StringBuilder sb = new StringBuilder()
-                .AppendLine("[user]")
-                .AppendFormat("name = {0}{1}", name, Environment.NewLine)
-                .AppendFormat("email = {0}{1}", email, Environment.NewLine);
-
-            File.WriteAllText(globalLocation, sb.ToString());
-            File.WriteAllText(systemLocation, string.Empty);
-            File.WriteAllText(xdgLocation, string.Empty);
-
-            var options = new RepositoryOptions {
-                GlobalConfigurationLocation = globalLocation,
-                XdgConfigurationLocation = xdgLocation,
-                SystemConfigurationLocation = systemLocation,
-            };
-
-            string path = SandboxBareTestRepo();
-            using (var repo = new Repository(path, options))
-            {
-                Assert.True(repo.Config.HasConfig(ConfigurationLevel.Global));
-                Assert.Equal(name, repo.Config.Get<string>("user.name").Value);
-                Assert.Equal(email, repo.Config.Get<string>("user.email").Value);
-
-                repo.Config.Set("xdg.setting", "https://twitter.com/libgit2sharp", ConfigurationLevel.Xdg);
-                repo.Config.Set("help.link", "https://twitter.com/xpaulbettsx/status/205761932626636800", ConfigurationLevel.System);
-            }
-
-            AssertValueInConfigFile(systemLocation, "xpaulbettsx");
-        }
-
         [Fact]
         public void CanCommitOnBareRepository()
         {

LibGit2Sharp/Branch.cs

@@ -176,31 +176,6 @@ public virtual string RemoteName
             }
         }
 
-        /// <summary>
-        /// Get the remote for the branch.
-        /// <para>
-        ///   If this is a local branch, this will return the configured
-        ///   <see cref="Remote"/> to fetch from and push to. If this is a
-        ///   remote-tracking branch, this will return the remote containing
-        ///   the tracked branch.
-        /// </para>
-        /// </summary>
-        [Obsolete("This property is deprecated. Use Repository.Network.Remotes[] using the RemoteName property")]
-        public virtual Remote Remote
-        {
-            get
-            {
-                string remoteName = RemoteName;
-
-                if (remoteName == null)
-                {
-                    return null;
-                }
-
-                return repo.Network.Remotes[remoteName];
-            }
-        }
-
         private string UpstreamBranchCanonicalNameFromLocalBranch()
         {
             ConfigurationEntry<string> mergeRefEntry = repo.Config.Get<string>("branch", FriendlyName, "merge");

LibGit2Sharp/CommitLog.cs

@@ -91,21 +91,6 @@ public IEnumerable<LogEntry> QueryBy(string path)
             return new FileHistory(repo, path);
         }
 
-        /// <summary>
-        /// Returns the list of commits of the repository representing the history of a file beyond renames.
-        /// </summary>
-        /// <param name="path">The file's path.</param>
-        /// <param name="filter">The options used to control which commits will be returned.</param>
-        /// <returns>A list of file history entries, ready to be enumerated.</returns>
-        [Obsolete("This method is deprecated. Please use the overload which take LibGit2Sharp.CommitFilter")]
-        public IEnumerable<LogEntry> QueryBy(string path, FollowFilter filter)
-        {
-            Ensure.ArgumentNotNull(path, "path");
-            Ensure.ArgumentNotNull(filter, "filter");
-
-            return QueryBy(path, new CommitFilter { SortBy = filter.SortBy });
-        }
-
         /// <summary>
         /// Returns the list of commits of the repository representing the history of a file beyond renames.
         /// </summary>

LibGit2Sharp/FollowFilter.cs

@@ -22,15 +22,6 @@ public interface IQueryableCommitLog : ICommitLog
         /// <returns>A list of file history entries, ready to be enumerated.</returns>
         IEnumerable<LogEntry> QueryBy(string path);
 
-        /// <summary>
-        /// Returns the list of commits of the repository representing the history of a file beyond renames.
-        /// </summary>
-        /// <param name="path">The file's path.</param>
-        /// <param name="filter">The options used to control which commits will be returned.</param>
-        /// <returns>A list of file history entries, ready to be enumerated.</returns>
-        [Obsolete("This method is deprecated. Please use the overload which take LibGit2Sharp.CommitFilter")]
-        IEnumerable<LogEntry> QueryBy(string path, FollowFilter filter);
-
         /// <summary>
         /// Returns the list of commits of the repository representing the history of a file beyond renames.
         /// </summary>

LibGit2Sharp/IQueryableCommitLog.cs

@@ -69,44 +69,6 @@ public interface IRepository : IDisposable
         /// </summary>
         SubmoduleCollection Submodules { get; }
 
-        /// <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>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Checkout()")]
-        Branch Checkout(Branch branch, CheckoutOptions options);
-
-        /// <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="options"><see cref="CheckoutOptions"/> controlling checkout behavior.</param>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Checkout()")]
-        Branch Checkout(string committishOrBranchSpec, CheckoutOptions options);
-
-        /// <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>
-        /// <returns>The <see cref="Branch"/> that was checked out.</returns>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Checkout()")]
-        Branch Checkout(Commit commit, CheckoutOptions options);
-
         /// <summary>
         /// Checkout the specified tree.
         /// </summary>
@@ -275,112 +237,6 @@ public interface IRepository : IDisposable
         /// <returns>The blame for the file.</returns>
         BlameHunkCollection Blame(string path, BlameOptions options);
 
-        /// <summary>
-        /// Promotes to the staging area the latest modifications of a file in the working directory (addition, updation or removal).
-        ///
-        /// If this path is ignored by configuration then it will not be staged unless <see cref="StageOptions.IncludeIgnored"/> is unset.
-        /// </summary>
-        /// <param name="path">The path of the file within the working directory.</param>
-        /// <param name="stageOptions">Determines how paths will be staged.</param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Stage()")]
-        void Stage(string path, StageOptions stageOptions);
-
-        /// <summary>
-        /// Promotes to the staging area the latest modifications of a collection of files in the working directory (addition, updation or removal).
-        ///
-        /// Any paths (even those listed explicitly) that are ignored by configuration will not be staged unless <see cref="StageOptions.IncludeIgnored"/> is unset.
-        /// </summary>
-        /// <param name="paths">The collection of paths of the files within the working directory.</param>
-        /// <param name="stageOptions">Determines how paths will be staged.</param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Stage()")]
-        void Stage(IEnumerable<string> paths, StageOptions stageOptions);
-
-        /// <summary>
-        /// Removes from the staging area all the modifications of a file since the latest commit (addition, updation or removal).
-        /// </summary>
-        /// <param name="path">The path of the file within the working directory.</param>
-        /// <param name="explicitPathsOptions">
-        /// The passed <paramref name="path"/> will be treated as explicit paths.
-        /// Use these options to determine how unmatched explicit paths should be handled.
-        /// </param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Unstage()")]
-        void Unstage(string path, ExplicitPathsOptions explicitPathsOptions);
-
-        /// <summary>
-        /// Removes from the staging area all the modifications of a collection of file since the latest commit (addition, updation or removal).
-        /// </summary>
-        /// <param name="paths">The collection of paths of the files within the working directory.</param>
-        /// <param name="explicitPathsOptions">
-        /// The passed <paramref name="paths"/> will be treated as explicit paths.
-        /// Use these options to determine how unmatched explicit paths should be handled.
-        /// </param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Unstage()")]
-        void Unstage(IEnumerable<string> paths, ExplicitPathsOptions explicitPathsOptions);
-
-        /// <summary>
-        /// Moves and/or renames a file in the working directory and promotes the change to the staging area.
-        /// </summary>
-        /// <param name="sourcePath">The path of the file within the working directory which has to be moved/renamed.</param>
-        /// <param name="destinationPath">The target path of the file within the working directory.</param>
-        [Obsolete("This method is deprecatd. Please use LibGit2Sharp.Commands.Move()")]
-        void Move(string sourcePath, string destinationPath);
-
-        /// <summary>
-        /// Moves and/or renames a collection of files in the working directory and promotes the changes to the staging area.
-        /// </summary>
-        /// <param name="sourcePaths">The paths of the files within the working directory which have to be moved/renamed.</param>
-        /// <param name="destinationPaths">The target paths of the files within the working directory.</param>
-        [Obsolete("This method is deprecatd. Please use LibGit2Sharp.Commands.Move()")]
-        void Move(IEnumerable<string> sourcePaths, IEnumerable<string> destinationPaths);
-
-        /// <summary>
-        /// Removes a file from the staging area, and optionally removes it from the working directory as well.
-        /// <para>
-        ///   If the file has already been deleted from the working directory, this method will only deal
-        ///   with promoting the removal to the staging area.
-        /// </para>
-        /// <para>
-        ///   The default behavior is to remove the file from the working directory as well.
-        /// </para>
-        /// <para>
-        ///   When not passing a <paramref name="explicitPathsOptions"/>, the passed path will be treated as
-        ///   a pathspec. You can for example use it to pass the relative path to a folder inside the working directory,
-        ///   so that all files beneath this folders, and the folder itself, will be removed.
-        /// </para>
-        /// </summary>
-        /// <param name="path">The path of the file within the working directory.</param>
-        /// <param name="removeFromWorkingDirectory">True to remove the file from the working directory, False otherwise.</param>
-        /// <param name="explicitPathsOptions">
-        /// The passed <paramref name="path"/> will be treated as an explicit path.
-        /// Use these options to determine how unmatched explicit paths should be handled.
-        /// </param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Remove()")]
-        void Remove(string path, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions);
-
-        /// <summary>
-        /// Removes a collection of fileS from the staging, and optionally removes them from the working directory as well.
-        /// <para>
-        ///   If a file has already been deleted from the working directory, this method will only deal
-        ///   with promoting the removal to the staging area.
-        /// </para>
-        /// <para>
-        ///   The default behavior is to remove the files from the working directory as well.
-        /// </para>
-        /// <para>
-        ///   When not passing a <paramref name="explicitPathsOptions"/>, the passed paths will be treated as
-        ///   a pathspec. You can for example use it to pass the relative paths to folders inside the working directory,
-        ///   so that all files beneath these folders, and the folders themselves, will be removed.
-        /// </para>
-        /// </summary>
-        /// <param name="paths">The collection of paths of the files within the working directory.</param>
-        /// <param name="removeFromWorkingDirectory">True to remove the files from the working directory, False otherwise.</param>
-        /// <param name="explicitPathsOptions">
-        /// The passed <paramref name="paths"/> will be treated as explicit paths.
-        /// Use these options to determine how unmatched explicit paths should be handled.
-        /// </param>
-        [Obsolete("This method is deprecated. Please use LibGit2Sharp.Commands.Unstage()")]
-        void Remove(IEnumerable<string> paths, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions);
-
         /// <summary>
         /// Retrieves the state of a file in the working directory, comparing it against the staging area and the latest commit.
         /// </summary>