| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<00000141f2176ffd-df2363a3-bc69-4b86-a1d3-807293476ba3-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/b6c0485fe133...1c77d330a7d0
Commit: 1c77d330a7d04442a580f9e938ef41875497a3d4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 00:07:18 GMT
URL: https://github.com/mono/monodevelop/commit/1c77d330a7d04442a580f9e938ef41875497a3d4
Revert "Merge pull request #420 from mono/fixAPI"
This reverts commit fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a, reversing
changes made to dc227b8c6495c8e3d643fa2d0d4c863eeba415c7.
This will break every third party VCS addin and also our own VCS extensions
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class PushCommandHandler: GitCommandHandler
+ class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- sealed class SwitchToBranchHandler: GitCommandHandler
+ class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- sealed class ManageBranchesHandler: GitCommandHandler
+ class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- sealed class MergeBranchHandler: GitCommandHandler
+ class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- sealed class RebaseBranchHandler: GitCommandHandler
+ class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- sealed class StashHandler: GitCommandHandler
+ class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- sealed class StashPopHandler: GitCommandHandler
+ class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class ManageStashesHandler: GitCommandHandler
+ class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- sealed class FilteredStatus : NGit.Api.StatusCommand
+ class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public ICollection<string> GetIgnoredNotInIndex ()
+ public virtual ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitCommitDialogExtension: CommitDialogExtension
+ public class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitCredentials: CredentialsProvider
+ public class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitNodeBuilderExtension: NodeBuilderExtension
+ public class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitOptionsPanel : OptionsPanel
+ public class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public sealed class GitRevision: Revision
+ public class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public sealed class Branch
+ public class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public sealed class RemoteSource
+ public class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- sealed class GitMonitor: ProgressMonitor, IDisposable
+ class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- sealed class LocalGitRepository: FileRepository
+ class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- sealed class GitSelectRevisionDialog : Xwt.Dialog
+ class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitSupportFeature: ISolutionItemFeature
+ public class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- static class GitUtil
+ internal static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
+ public class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public MyersDiff SetCached(bool cached)
+ public virtual MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public MyersDiff SetOutputStream(OutputStream @out)
+ public virtual MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public MyersDiff SetContextLines(int contextLines)
+ public virtual MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public MyersDiff SetSourcePrefix(string sourcePrefix)
+ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public MyersDiff SetDestinationPrefix(string destinationPrefix
+ public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class Stash
+ public class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public sealed class LibApr0: LibApr
+ public class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public sealed class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public sealed class LibApr1: LibApr
+ public class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public sealed class LibSvnClient0 : LibSvnClient {
+ public class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public sealed class LibSvnClient1 : LibSvnClient {
+ public class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public sealed class SvnRevision : Revision
+ public class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
+ public class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public sealed class BlameWidget : Bin
+ public class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public sealed class ChangeSetView: ScrolledWindow
+ public class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public sealed class ComparisonWidget : EditorCompareWidgetBase
+ public class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public sealed class DiffParser : TypeSystemParser
+ public class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public sealed class DropDownBox : Gtk.Button
+ public class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- sealed class LogView : BaseView, ILogView
+ public class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- sealed class MergeView : BaseView, IMergeView
+ class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public sealed class MergeWidget : EditorCompareWidgetBase
+ public class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- sealed class StatusView : BaseView
+ internal class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- sealed class SubviewAttachmentHandler : CommandHandler
+ class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class AddCommand
+ internal class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- class AddWorker : Task {
+ private class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- sealed class RemoveCommand
+ internal class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- class RemoveWorker : Task {
+ private class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- abstract class BaseView : AbstractBaseViewContent, IViewContent
+ public abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- protected BaseView (string name)
+ public BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class BlameCommand
+ public class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- sealed class ChangeLogWriter
+ class ChangeLogWriter
{
- Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- string changelog_path;
+ private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ private string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- string GetRelativeEntryPath (string path)
+ private string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- var formatter = new TextFormatter ();
+ TextFormatter formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class CheckoutCommand : CommandHandler
+ internal class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
-
- class CheckoutWorker : Task
+ }
+
+ class CheckoutWorker : Task
+ {
+ Repository vc;
+ string path;
+
+ public CheckoutWorker (Repository vc, string path)
{
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
+ }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
+ }
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
}
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
}
- protected override void Run ()
- {
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
-
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
+ foreach (string str in list ) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
}
-
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
projectFn = str;
break;
}
- }
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
- }
- if ( projectFn == null ) {
- foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
- projectFn = str;
- break;
- }
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
- }
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
}
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
+ class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class AddCommandHandler: FileVersionControlCommandHandler
+ class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class RemoveCommandHandler: FileVersionControlCommandHandler
+ class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class RevertCommandHandler: FileVersionControlCommandHandler
+ class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class LockCommandHandler: FileVersionControlCommandHandler
+ class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class UnlockCommandHandler: FileVersionControlCommandHandler
+ class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
+ class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
+ class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
+ class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- static class CommitCommand
+ class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- class CommitWorker : Task
+ private class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- static class CreatePatchCommand
+ public class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,8 +56,7 @@ static class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can)
- return can;
+ if (test || !can){ return can; }
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultBlameViewHandler : IBlameViewHandler
+ public class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultDiffViewHandler : IDiffViewHandler
+ public class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultLogViewHandler : ILogViewHandler
+ public class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultMergeViewHandler : IMergeViewHandler
+ public class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class DiffCommand
+ public class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- static class IgnoreCommand
+ class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- class IgnoreWorker : Task
+ private class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- static class UnignoreCommand
+ class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- class UnignoreWorker : Task
+ private class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- static class LockCommand
+ public class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- class LockWorker : Task
+ private class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class LogCommand
+ public class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class MergeCommand
+ public class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- static class PublishCommand
+ internal class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
+ }
+
+ internal class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
- class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- protected Repository ()
+ public Repository ()
{
infoCache = new VersionInfoCache (this);
}
- protected Repository (VersionControlSystem vcs): this ()
+ public Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- static class ResolveConflictsCommand
+ public class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,8 +7,9 @@
namespace MonoDevelop.VersionControl
{
- static class RevertCommand
+ internal class RevertCommand
{
+
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -19,7 +20,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- static bool RevertInternal (VersionControlItemList items, bool test)
+ private static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -42,22 +43,22 @@ static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- class RevertWorker : Task {
+ private class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -73,5 +74,6 @@ protected override void Run ()
});
}
}
+
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class RevertRevisionsCommands
+ internal class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- class RevertWorker : Task {
+ private class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,5 +130,6 @@ protected override void Run ()
});
}
}
+
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- abstract class Task
+ internal abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class UnknownRepository: Repository, IExtendedDataItem
+ public class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- static class UnlockCommand
+ public class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- class UnlockWorker : Task
+ private class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- static class UpdateCommand
+ internal class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- class UpdateWorker : Task {
+ private class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- protected UrlBasedRepository ()
+ public UrlBasedRepository ()
{
}
- protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class VersionControlConfiguration
+ class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlFileSystemExtension: FileSystemExtension
+ internal class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlItem
+ public class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlItemList: List<VersionControlItem>
+ public class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- sealed class AddinCommandHandler : VersionControlCommandHandler
+ class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
item.Visible = res == TestResult.Enable;
}
- TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- sealed class OpenCommandHandler : VersionControlCommandHandler
+ class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public static class VersionControlService
+ public class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionInfo
+ public class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class VersionInfoCache
+ class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- sealed class DirectoryStatus
+ class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches