From 1d7ed78becba8b9dd6026a839dea466c61d357de Mon Sep 17 00:00:00 2001 From: nulltoken Date: Tue, 4 Nov 2014 16:32:11 -0800 Subject: [PATCH] Drop obsolete members after release v0.20.0 --- LibGit2Sharp/GlobalSettings.cs | 11 -- LibGit2Sharp/Index.cs | 165 ------------------ LibGit2Sharp/Reference.cs | 11 -- LibGit2Sharp/ReferenceCollection.cs | 28 --- LibGit2Sharp/ReferenceCollectionExtensions.cs | 17 -- LibGit2Sharp/Repository.cs | 13 -- 6 files changed, 245 deletions(-) diff --git a/LibGit2Sharp/GlobalSettings.cs b/LibGit2Sharp/GlobalSettings.cs index 190cfadf4..e63124fa7 100644 --- a/LibGit2Sharp/GlobalSettings.cs +++ b/LibGit2Sharp/GlobalSettings.cs @@ -13,17 +13,6 @@ public static class GlobalSettings private static LogConfiguration logConfiguration = LogConfiguration.None; - /// - /// Returns all the optional features that were compiled into - /// libgit2. - /// - /// A enumeration. - [Obsolete("This method will be removed in the next release. Use Version.Features instead.")] - public static BuiltInFeatures Features() - { - return Version.Features; - } - /// /// Returns information related to the current LibGit2Sharp /// library. diff --git a/LibGit2Sharp/Index.cs b/LibGit2Sharp/Index.cs index 5e9e941a0..714a49fb8 100644 --- a/LibGit2Sharp/Index.cs +++ b/LibGit2Sharp/Index.cs @@ -127,149 +127,6 @@ IEnumerator IEnumerable.GetEnumerator() #endregion - /// - /// 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 is unset. - /// - /// The path of the file within the working directory. - /// If set, determines how paths will be staged. - [Obsolete("This method will be removed in the next release. Use IRepository.Stage() instead.")] - public virtual void Stage(string path, StageOptions stageOptions = null) - { - repo.Stage(path, stageOptions); - } - - /// - /// 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 is unset. - /// - /// The collection of paths of the files within the working directory. - /// If set, determines how paths will be staged. - [Obsolete("This method will be removed in the next release. Use IRepository.Stage() instead.")] - public virtual void Stage(IEnumerable paths, StageOptions stageOptions = null) - { - repo.Stage(paths, stageOptions); - } - - /// - /// Removes from the staging area all the modifications of a file since the latest commit (addition, updation or removal). - /// - /// The path of the file within the working directory. - /// - /// If set, the passed will be treated as explicit paths. - /// Use these options to determine how unmatched explicit paths should be handled. - /// - [Obsolete("This method will be removed in the next release. Use IRepository.Unstage() instead.")] - public virtual void Unstage(string path, ExplicitPathsOptions explicitPathsOptions = null) - { - repo.Unstage(path, explicitPathsOptions); - } - - /// - /// Removes from the staging area all the modifications of a collection of file since the latest commit (addition, updation or removal). - /// - /// The collection of paths of the files within the working directory. - /// - /// If set, the passed will be treated as explicit paths. - /// Use these options to determine how unmatched explicit paths should be handled. - /// - [Obsolete("This method will be removed in the next release. Use IRepository.Unstage() instead.")] - public virtual void Unstage(IEnumerable paths, ExplicitPathsOptions explicitPathsOptions = null) - { - repo.Unstage(paths, explicitPathsOptions); - } - - /// - /// Moves and/or renames a file in the working directory and promotes the change to the staging area. - /// - /// The path of the file within the working directory which has to be moved/renamed. - /// The target path of the file within the working directory. - [Obsolete("This method will be removed in the next release. Use IRepository.Move() instead.")] - public virtual void Move(string sourcePath, string destinationPath) - { - repo.Move(new[] { sourcePath }, new[] { destinationPath }); - } - - /// - /// Moves and/or renames a collection of files in the working directory and promotes the changes to the staging area. - /// - /// The paths of the files within the working directory which have to be moved/renamed. - /// The target paths of the files within the working directory. - [Obsolete("This method will be removed in the next release. Use IRepository.Move() instead.")] - public virtual void Move(IEnumerable sourcePaths, IEnumerable destinationPaths) - { - repo.Move(sourcePaths, destinationPaths); - } - - /// - /// Removes a file from the staging area, and optionally removes it from the working directory as well. - /// - /// If the file has already been deleted from the working directory, this method will only deal - /// with promoting the removal to the staging area. - /// - /// - /// The default behavior is to remove the file from the working directory as well. - /// - /// - /// When not passing a , 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. - /// - /// - /// The path of the file within the working directory. - /// True to remove the file from the working directory, False otherwise. - /// - /// If set, the passed will be treated as an explicit path. - /// Use these options to determine how unmatched explicit paths should be handled. - /// - [Obsolete("This method will be removed in the next release. Use IRepository.Remove() instead.")] - public virtual void Remove(string path, bool removeFromWorkingDirectory = true, ExplicitPathsOptions explicitPathsOptions = null) - { - repo.Remove(new[] { path }, removeFromWorkingDirectory, explicitPathsOptions); - } - - /// - /// Removes a collection of fileS from the staging, and optionally removes them from the working directory as well. - /// - /// If a file has already been deleted from the working directory, this method will only deal - /// with promoting the removal to the staging area. - /// - /// - /// The default behavior is to remove the files from the working directory as well. - /// - /// - /// When not passing a , 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. - /// - /// - /// The collection of paths of the files within the working directory. - /// True to remove the files from the working directory, False otherwise. - /// - /// If set, the passed will be treated as explicit paths. - /// Use these options to determine how unmatched explicit paths should be handled. - /// - [Obsolete("This method will be removed in the next release. Use IRepository.Remove() instead.")] - public virtual void Remove(IEnumerable paths, bool removeFromWorkingDirectory = true, ExplicitPathsOptions explicitPathsOptions = null) - { - repo.Remove(paths, removeFromWorkingDirectory, explicitPathsOptions); - } - - /// - /// Replaces entries in the staging area with entries from the specified tree. - /// - /// This overwrites all existing state in the staging area. - /// - /// - /// The to read the entries from. - [Obsolete("This method will be removed in the next release. Use Replace instead.")] - public virtual void Reset(Tree source) - { - Replace(source); - } - /// /// Replaces entries in the staging area with entries from the specified tree. /// @@ -312,28 +169,6 @@ private void UpdatePhysicalIndex() Proxy.git_index_write(handle); } - /// - /// Retrieves the state of a file in the working directory, comparing it against the staging area and the latest commmit. - /// - /// The relative path within the working directory to the file. - /// A representing the state of the parameter. - [Obsolete("This method will be removed in the next release. Use IRepository.RetrieveStatus() instead.")] - public virtual FileStatus RetrieveStatus(string filePath) - { - return repo.RetrieveStatus(filePath); - } - - /// - /// Retrieves the state of all files in the working directory, comparing them against the staging area and the latest commmit. - /// - /// If set, the options that control the status investigation. - /// A holding the state of all the files. - [Obsolete("This method will be removed in the next release. Use IRepository.RetrieveStatus() instead.")] - public virtual RepositoryStatus RetrieveStatus(StatusOptions options = null) - { - return repo.RetrieveStatus(options); - } - internal void Replace(TreeChanges changes) { foreach (TreeEntryChanges treeEntryChanges in changes) diff --git a/LibGit2Sharp/Reference.cs b/LibGit2Sharp/Reference.cs index 8ab7d1b78..5b0787ede 100644 --- a/LibGit2Sharp/Reference.cs +++ b/LibGit2Sharp/Reference.cs @@ -25,17 +25,6 @@ public abstract class Reference : IEquatable, IBelongToARepository protected Reference() { } - /// - /// Initializes a new instance of the class. - /// - /// The canonical name. - /// The target identifier. - [Obsolete("This ctor will be removed in a future release.")] - protected Reference(string canonicalName, string targetIdentifier) - : this(null, canonicalName, targetIdentifier) - { - } - /// /// This would be protected+internal, were that supported by C#. /// Do not use except in subclasses. diff --git a/LibGit2Sharp/ReferenceCollection.cs b/LibGit2Sharp/ReferenceCollection.cs index a6d89c9e0..a564e82b9 100644 --- a/LibGit2Sharp/ReferenceCollection.cs +++ b/LibGit2Sharp/ReferenceCollection.cs @@ -142,34 +142,6 @@ public virtual void Remove(Reference reference) Proxy.git_reference_remove(repo.Handle, reference.CanonicalName); } - /// - /// Rename an existing reference with a new name, and update the reflog - /// - /// The reference to rename. - /// The new canonical name. - /// Identity used for updating the reflog. - /// Message added to the reflog. - /// True to allow silent overwriting a potentially existing reference, false otherwise. - /// A new . - [Obsolete("This method will be removed in the next release. Please use Rename() instead.")] - public virtual Reference Move(Reference reference, string newName, Signature signature, string logMessage = null, bool allowOverwrite = false) - { - return Rename(reference, newName, signature, logMessage, allowOverwrite); - } - - /// - /// Rename an existing reference with a new name - /// - /// The reference to rename. - /// The new canonical name. - /// True to allow silent overwriting a potentially existing reference, false otherwise. - /// A new . - [Obsolete("This method will be removed in the next release. Please use Rename() instead.")] - public virtual Reference Move(Reference reference, string newName, bool allowOverwrite = false) - { - return Rename(reference, newName, null, null, allowOverwrite); - } - /// /// Rename an existing reference with a new name, and update the reflog /// diff --git a/LibGit2Sharp/ReferenceCollectionExtensions.cs b/LibGit2Sharp/ReferenceCollectionExtensions.cs index 962a5af94..34c2a6623 100644 --- a/LibGit2Sharp/ReferenceCollectionExtensions.cs +++ b/LibGit2Sharp/ReferenceCollectionExtensions.cs @@ -124,23 +124,6 @@ public static Reference UpdateTarget(this ReferenceCollection refsColl, Referenc return UpdateTarget(refsColl, directRef, objectish, null, null); } - /// - /// Rename an existing reference with a new name - /// - /// The canonical name of the reference to rename. - /// The new canonical name. - /// The identity used for updating the reflog - /// The optional message to log in the - /// True to allow silent overwriting a potentially existing reference, false otherwise. - /// The being worked with. - /// A new . - [Obsolete("This method will be removed in the next release. Please use Rename() instead.")] - public static Reference Move(this ReferenceCollection refsColl, string currentName, string newName, - Signature signature = null, string logMessage = null, bool allowOverwrite = false) - { - return refsColl.Rename(currentName, newName, signature, logMessage, allowOverwrite); - } - /// /// Rename an existing reference with a new name /// diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index 1c81bd26d..69e0e195d 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -961,19 +961,6 @@ internal T RegisterForCleanup(T disposable) where T : IDisposable return disposable; } - /// - /// Gets the current LibGit2Sharp version. - /// - /// The format of the version number is as follows: - /// Major.Minor.Patch-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features) - /// - /// - [Obsolete("This property will be removed in the next release. Use GlobalSettings.Version instead.")] - public static string Version - { - get { return GlobalSettings.Version.ToString(); } - } - /// /// Merges changes from commit into the branch pointed at by HEAD. ///