| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<0000014223e37876-04b611b0-95f0-490a-bffc-21428523b2e3-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/2e9a17e32533...2ee0ea417f09
Commit: c04000a39d66f07a7bc86e5082dd83824e2cbbf9
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 15:43:12 GMT
URL: https://github.com/mono/monodevelop/commit/c04000a39d66f07a7bc86e5082dd83824e2cbbf9
[Subversion] Win32 cleanup.
Changed paths:
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -48,7 +48,7 @@ public override bool IsInstalled
{
if (!errorShown && installError) {
errorShown = true;
- AlertButton db = new AlertButton ("Go to Download Page");
+ var db = new AlertButton ("Go to Download Page");
AlertButton res = MessageService.AskQuestion ("The Subversion add-in could not be initialized", "This add-in requires the 'Microsoft Visual C++ 2005 Service Pack 1 Redistributable'. You may need to install it.", db, AlertButton.Ok);
if (res == db) {
DesktopService.ShowUrl ("http://www.microsoft.com/downloads/details.aspx?familyid=766a6af7-ec73-40ff-b072-9112bab119c2");
@@ -84,7 +84,7 @@ sealed class SvnSharpBackend: SubversionBackend
public override string GetTextBase (string sourcefile)
{
- MemoryStream data = new MemoryStream ();
+ var data = new MemoryStream ();
try {
// This outputs the contents of the base revision
// of a file to a stream.
@@ -108,11 +108,11 @@ public SvnSharpBackend ()
void Init ()
{
client = new SvnClient ();
- client.Authentication.SslClientCertificateHandlers += new EventHandler<SvnSslClientCertificateEventArgs> (AuthenticationSslClientCertificateHandlers);
- client.Authentication.SslClientCertificatePasswordHandlers += new EventHandler<SvnSslClientCertificatePasswordEventArgs> (AuthenticationSslClientCertificatePasswordHandlers);
- client.Authentication.SslServerTrustHandlers += new EventHandler<SvnSslServerTrustEventArgs> (AuthenticationSslServerTrustHandlers);
- client.Authentication.UserNameHandlers += new EventHandler<SvnUserNameEventArgs> (AuthenticationUserNameHandlers);
- client.Authentication.UserNamePasswordHandlers += new EventHandler<SvnUserNamePasswordEventArgs> (AuthenticationUserNamePasswordHandlers);
+ client.Authentication.SslClientCertificateHandlers += AuthenticationSslClientCertificateHandlers;
+ client.Authentication.SslClientCertificatePasswordHandlers += AuthenticationSslClientCertificatePasswordHandlers;
+ client.Authentication.SslServerTrustHandlers += AuthenticationSslServerTrustHandlers;
+ client.Authentication.UserNameHandlers += AuthenticationUserNameHandlers;
+ client.Authentication.UserNamePasswordHandlers += AuthenticationUserNamePasswordHandlers;
client.Notify += delegate (object o, SvnNotifyEventArgs e) {
if (updateMonitor == null)
return;
@@ -139,7 +139,7 @@ void Init ()
};
}
- void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordEventArgs e)
+ static void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordEventArgs e)
{
string user = e.UserName;
string password;
@@ -150,7 +150,7 @@ void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordE
e.Save = save;
}
- void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
+ static void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
{
string name = e.UserName;
bool save;
@@ -159,12 +159,12 @@ void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
e.Save = save;
}
- void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEventArgs e)
+ static void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEventArgs e)
{
SslFailure acceptedFailures;
bool save;
- CertficateInfo certInfo = new CertficateInfo ();
+ var certInfo = new CertficateInfo ();
certInfo.AsciiCert = e.CertificateValue;
certInfo.Fingerprint = e.Fingerprint;
certInfo.HostName = e.CommonName;
@@ -178,7 +178,7 @@ void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEvent
e.Save = save;
}
- void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslClientCertificatePasswordEventArgs e)
+ static void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslClientCertificatePasswordEventArgs e)
{
string password;
bool save;
@@ -187,7 +187,7 @@ void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslCl
e.Save = save;
}
- void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCertificateEventArgs e)
+ static void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCertificateEventArgs e)
{
string file;
bool save;
@@ -198,8 +198,8 @@ void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCert
public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)
{
- SvnAddArgs args = new SvnAddArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnAddArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty;
lock (client)
client.Add (path, args);
@@ -207,8 +207,8 @@ public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)
public override void Checkout (string url, FilePath path, Revision rev, bool recurse, IProgressMonitor monitor)
{
- SvnCheckOutArgs args = new SvnCheckOutArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnCheckOutArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty;
lock (client) {
try {
@@ -222,8 +222,8 @@ public override void Checkout (string url, FilePath path, Revision rev, bool rec
public override void Commit (FilePath[] paths, string message, IProgressMonitor monitor)
{
- SvnCommitArgs args = new SvnCommitArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnCommitArgs ();
+ BindMonitor (monitor);
args.LogMessage = message;
lock (client)
client.Commit (paths.ToStringArray (), args);
@@ -231,8 +231,8 @@ public override void Commit (FilePath[] paths, string message, IProgressMonitor
public override void Delete (FilePath path, bool force, IProgressMonitor monitor)
{
- SvnDeleteArgs args = new SvnDeleteArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnDeleteArgs ();
+ BindMonitor (monitor);
args.Force = force;
lock (client)
client.Delete (path, args);
@@ -246,10 +246,10 @@ public override string GetTextAtRevision (string repositoryPath, Revision revisi
public override string GetTextAtRevision (string repositoryPath, Revision revision, string rootPath)
{
- MemoryStream ms = new MemoryStream ();
+ var ms = new MemoryStream ();
SvnUriTarget target = client.GetUriFromWorkingCopy (rootPath);
// Redo path link.
- repositoryPath = repositoryPath.TrimStart (new char[] { '/' });
+ repositoryPath = repositoryPath.TrimStart (new [] { '/' });
foreach (var segment in target.Uri.Segments) {
if (repositoryPath.StartsWith (segment, StringComparison.Ordinal))
repositoryPath = repositoryPath.Remove (0, segment.Length);
@@ -291,14 +291,14 @@ public override IEnumerable<DirectoryEntry> List (FilePath path, bool recurse, S
IEnumerable<DirectoryEntry> List (SvnTarget target, bool recurse)
{
- List<DirectoryEntry> list = new List<DirectoryEntry> ();
- SvnListArgs args = new SvnListArgs ();
+ var list = new List<DirectoryEntry> ();
+ var args = new SvnListArgs ();
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
lock (client)
client.List (target, args, delegate (object o, SvnListEventArgs a) {
if (string.IsNullOrEmpty (a.Path))
return;
- DirectoryEntry de = new DirectoryEntry ();
+ var de = new DirectoryEntry ();
de.CreatedRevision = ToBaseRevision (a.Entry.Revision).Rev;
de.HasProps = a.Entry.HasProperties;
de.IsDirectory = a.Entry.NodeKind == SvnNodeKind.Directory;
@@ -313,18 +313,18 @@ IEnumerable<DirectoryEntry> List (SvnTarget target, bool recurse)
public override IEnumerable<SvnRevision> Log (Repository repo, FilePath path, SvnRevision revisionStart, SvnRevision revisionEnd)
{
- List<SvnRevision> list = new List<SvnRevision> ();
- SvnLogArgs args = new SvnLogArgs ();
+ var list = new List<SvnRevision> ();
+ var args = new SvnLogArgs ();
args.Range = new SvnRevisionRange (GetRevision (revisionStart), GetRevision (revisionEnd));
lock (client)
client.Log (path, args, delegate (object o, SvnLogEventArgs a) {
- List<RevisionPath> paths = new List<RevisionPath> ();
- foreach (SvnChangeItem item in a.ChangedPaths) {
- paths.Add (new RevisionPath (item.Path, ConvertRevisionAction (item.Action), ""));
- }
- SvnRevision r = new SvnRevision (repo, (int) a.Revision, a.Time, a.Author, a.LogMessage, paths.ToArray ());
- list.Add (r);
- });
+ var paths = new List<RevisionPath> ();
+ foreach (SvnChangeItem item in a.ChangedPaths) {
+ paths.Add (new RevisionPath (item.Path, ConvertRevisionAction (item.Action), ""));
+ }
+ var r = new SvnRevision (repo, (int) a.Revision, a.Time, a.Author, a.LogMessage, paths.ToArray ());
+ list.Add (r);
+ });
return list;
}
@@ -341,10 +341,10 @@ static RevisionAction ConvertRevisionAction (SvnChangeAction svnChangeAction)
public override void Mkdir (string[] paths, string message, IProgressMonitor monitor)
{
- SvnCreateDirectoryArgs args = new SvnCreateDirectoryArgs ();
+ var args = new SvnCreateDirectoryArgs ();
args.CreateParents = true;
- BindMonitor (args, monitor);
- List<Uri> uris = new List<Uri> ();
+ BindMonitor (monitor);
+ var uris = new List<Uri> ();
foreach (string path in paths)
uris.Add (new Uri (path));
args.LogMessage = message;
@@ -354,8 +354,8 @@ public override void Mkdir (string[] paths, string message, IProgressMonitor mon
public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, IProgressMonitor monitor)
{
- SvnMoveArgs args = new SvnMoveArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnMoveArgs ();
+ BindMonitor (monitor);
args.Force = force;
lock (client)
client.Move (srcPath, destPath, args);
@@ -363,23 +363,23 @@ public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev,
public override string GetUnifiedDiff (FilePath path1, SvnRevision revision1, FilePath path2, SvnRevision revision2, bool recursive)
{
- SvnPathTarget t1 = new SvnPathTarget (path1, GetRevision (revision1));
- SvnPathTarget t2 = new SvnPathTarget (path2, GetRevision (revision2));
- SvnDiffArgs args = new SvnDiffArgs ();
+ var t1 = new SvnPathTarget (path1, GetRevision (revision1));
+ var t2 = new SvnPathTarget (path2, GetRevision (revision2));
+ var args = new SvnDiffArgs ();
args.Depth = recursive ? SvnDepth.Infinity : SvnDepth.Children;
- MemoryStream ms = new MemoryStream ();
+ var ms = new MemoryStream ();
lock (client)
client.Diff (t1, t2, args, ms);
ms.Position = 0;
- using (StreamReader sr = new StreamReader (ms)) {
+ using (var sr = new StreamReader (ms)) {
return sr.ReadToEnd ();
}
}
public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor monitor)
{
- SvnRevertArgs args = new SvnRevertArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnRevertArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
lock (client)
client.Revert (paths.ToStringArray (), args);
@@ -387,36 +387,34 @@ public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor mo
public override void RevertRevision (FilePath path, Revision revision, IProgressMonitor monitor)
{
- SvnMergeArgs args = new SvnMergeArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnMergeArgs ();
+ BindMonitor (monitor);
Revision prev = ((SvnRevision) revision).GetPrevious ();
- SvnRevisionRange range = new SvnRevisionRange (GetRevision (revision), GetRevision (prev));
+ var range = new SvnRevisionRange (GetRevision (revision), GetRevision (prev));
lock (client)
client.Merge (path, new SvnPathTarget (path), range, args);
}
public override void RevertToRevision (FilePath path, Revision revision, IProgressMonitor monitor)
{
- SvnMergeArgs args = new SvnMergeArgs ();
- BindMonitor (args, monitor);
- SvnRevisionRange range = new SvnRevisionRange (GetRevision (SvnRevision.Head), GetRevision (revision));
+ var args = new SvnMergeArgs ();
+ BindMonitor (monitor);
+ var range = new SvnRevisionRange (GetRevision (SvnRevision.Head), GetRevision (revision));
lock (client)
client.Merge (path, new SvnPathTarget (path), range, args);
}
public override IEnumerable<VersionInfo> Status (Repository repo, FilePath path, SvnRevision revision, bool descendDirs, bool changedItemsOnly, bool remoteStatus)
{
- List<VersionInfo> list = new List<VersionInfo> ();
- SvnStatusArgs args = new SvnStatusArgs ();
+ var list = new List<VersionInfo> ();
+ var args = new SvnStatusArgs ();
args.Revision = GetRevision (revision);
args.Depth = descendDirs ? SvnDepth.Infinity : SvnDepth.Children;
args.RetrieveAllEntries = !changedItemsOnly;
args.RetrieveRemoteStatus = remoteStatus;
lock (client) {
try {
- client.Status (path, args, delegate (object o, SvnStatusEventArgs a) {
- list.Add (CreateVersionInfo (repo, a));
- });
+ client.Status (path, args, (o, a) => list.Add (CreateVersionInfo (repo, a)));
} catch (SvnInvalidNodeKindException e) {
if (e.SvnErrorCode == SvnErrorCode.SVN_ERR_WC_NOT_WORKING_COPY)
list.Add (VersionInfo.CreateUnversioned (e.File, true));
@@ -463,7 +461,7 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
if (ent.WorkingCopyInfo != null)
newRev = new SvnRevision (repo, (int) ent.WorkingCopyInfo.Revision);
- VersionInfo ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
+ var ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
status, newRev,
rs, rr);
return ret;
@@ -496,8 +494,8 @@ static VersionStatus ConvertStatus (SvnSchedule schedule, SvnStatus status)
public override void Lock (IProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)
{
- SvnLockArgs args = new SvnLockArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnLockArgs ();
+ BindMonitor (monitor);
args.Comment = comment;
args.StealLock = stealLock;
lock (client)
@@ -506,8 +504,8 @@ public override void Lock (IProgressMonitor monitor, string comment, bool stealL
public override void Unlock (IProgressMonitor monitor, bool breakLock, params FilePath[] paths)
{
- SvnUnlockArgs args = new SvnUnlockArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnUnlockArgs ();
+ BindMonitor (monitor);
args.BreakLock = breakLock;
lock (client)
client.Unlock (paths.ToStringArray (), args);
@@ -515,8 +513,8 @@ public override void Unlock (IProgressMonitor monitor, bool breakLock, params Fi
public override void Update (FilePath path, bool recurse, IProgressMonitor monitor)
{
- SvnUpdateArgs args = new SvnUpdateArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnUpdateArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
client.Update (path, args);
}
@@ -552,24 +550,24 @@ public override Annotation[] GetAnnotations (Repository repo, FilePath file, Svn
if (file == FilePath.Null)
throw new ArgumentNullException ();
- SvnPathTarget target = new SvnPathTarget (file, SharpSvn.SvnRevision.Base);
- MemoryStream data = new MemoryStream ();
+ var target = new SvnPathTarget (file, SharpSvn.SvnRevision.Base);
+ var data = new MemoryStream ();
int numAnnotations = 0;
client.Write (target, data);
- using (StreamReader reader = new StreamReader (data)) {
+ using (var reader = new StreamReader (data)) {
reader.BaseStream.Seek (0, SeekOrigin.Begin);
while (reader.ReadLine () != null)
numAnnotations++;
}
System.Collections.ObjectModel.Collection<SvnBlameEventArgs> list;
- SvnBlameArgs args = new SvnBlameArgs ();
+ var args = new SvnBlameArgs ();
args.Start = GetRevision (revStart);
args.End = GetRevision (revEnd);
if (client.GetBlame (target, args, out list)) {
- Annotation[] annotations = new Annotation [numAnnotations];
+ var annotations = new Annotation [numAnnotations];
foreach (var annotation in list) {
if (annotation.LineNumber < annotations.Length)
annotations [(int)annotation.LineNumber] = new Annotation (annotation.Revision.ToString (),
@@ -584,7 +582,7 @@ static SharpSvn.SvnRevision GetRevision (Revision rev)
{
if (rev == null)
return null;
- SvnRevision srev = (SvnRevision) rev;
+ var srev = (SvnRevision) rev;
if (srev == SvnRevision.Base)
return new SharpSvn.SvnRevision (SvnRevisionType.Base);
if (srev == SvnRevision.Committed)
@@ -630,7 +628,7 @@ class ProgressData
public int Seconds;
}
- void BindMonitor (SvnClientArgs args, IProgressMonitor monitor)
+ void BindMonitor (IProgressMonitor monitor)
{
notifyData = new NotifData ();
progressData = new ProgressData ();
@@ -690,106 +688,101 @@ static void Notify (SvnNotifyEventArgs e, NotifData notifData, IProgressMonitor
bool notifyChange = false;
switch (e.Action) {
- case SvnNotifyAction.Skip:
- if (e.ContentState == SvnNotifyState.Missing) {
- actiondesc = string.Format (GettextCatalog.GetString ("Skipped missing target: '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Skipped '{0}'"), file);
- }
- break;
- case SvnNotifyAction.UpdateDelete:
- actiondesc = string.Format (GettextCatalog.GetString ("Deleted '{0}'"), file);
- break;
-
- case SvnNotifyAction.UpdateAdd:
- if (e.ContentState == SvnNotifyState.Conflicted) {
- actiondesc = string.Format (GettextCatalog.GetString ("Conflict {0}"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Added {0}"), file);
- }
- break;
- case SvnNotifyAction.Restore:
- actiondesc = string.Format (GettextCatalog.GetString ("Restored '{0}'"), file);
- break;
- case SvnNotifyAction.Revert:
- actiondesc = string.Format (GettextCatalog.GetString ("Reverted '{0}'"), file);
- break;
- case SvnNotifyAction.RevertFailed:
- actiondesc = string.Format (GettextCatalog.GetString ("Failed to revert '{0}' -- try updating instead."), file);
- break;
- case SvnNotifyAction.Resolved:
- actiondesc = string.Format (GettextCatalog.GetString ("Resolved conflict state of '{0}'"), file);
- break;
- case SvnNotifyAction.Add:
- if (e.MimeTypeIsBinary) {
- actiondesc = string.Format (GettextCatalog.GetString ("Add (bin) '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Add '{0}'"), file);
- }
- break;
- case SvnNotifyAction.Delete:
- actiondesc = string.Format (GettextCatalog.GetString ("Delete '{0}'"), file);
- break;
-
- case SvnNotifyAction.UpdateUpdate:
- actiondesc = string.Format (GettextCatalog.GetString ("Update '{0}'"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.UpdateExternal:
- actiondesc = string.Format (GettextCatalog.GetString ("Fetching external item into '{0}'"), file);
- break;
- case SvnNotifyAction.UpdateCompleted: // TODO
- actiondesc = GettextCatalog.GetString ("Finished");
- break;
- case SvnNotifyAction.StatusExternal:
- actiondesc = string.Format (GettextCatalog.GetString ("Performing status on external item at '{0}'"), file);
- break;
- case SvnNotifyAction.StatusCompleted:
- actiondesc = string.Format (GettextCatalog.GetString ("Status against revision: '{0}'"), e.Revision);
- break;
-
- case SvnNotifyAction.CommitDeleted:
- actiondesc = string.Format (GettextCatalog.GetString ("Deleting {0}"), file);
- break;
- case SvnNotifyAction.CommitModified:
- actiondesc = string.Format (GettextCatalog.GetString ("Sending {0}"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.CommitAdded:
- if (e.MimeTypeIsBinary) {
- actiondesc = string.Format (GettextCatalog.GetString ("Adding (bin) '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Adding '{0}'"), file);
- }
- break;
- case SvnNotifyAction.CommitReplaced:
- actiondesc = string.Format (GettextCatalog.GetString ("Replacing {0}"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.CommitSendData:
- if (!notifData.SendingData) {
- notifData.SendingData = true;
- actiondesc = GettextCatalog.GetString ("Transmitting file data");
- }
- else {
- actiondesc = ".";
- skipEol = true;
- }
- break;
-
- case SvnNotifyAction.LockLocked:
- actiondesc = string.Format (GettextCatalog.GetString ("'{0}' locked by user '{1}'."), file, e.Lock.Owner);
- break;
- case SvnNotifyAction.LockUnlocked:
- actiondesc = string.Format (GettextCatalog.GetString ("'{0}' unlocked."), file);
- break;
- default:
- actiondesc = e.Action.ToString () + " " + file;
- break;
+ case SvnNotifyAction.Skip:
+ if (e.ContentState == SvnNotifyState.Missing) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Skipped missing target: '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Skipped '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.UpdateDelete:
+ actiondesc = string.Format (GettextCatalog.GetString ("Deleted '{0}'"), file);
+ break;
+
+ case SvnNotifyAction.UpdateAdd:
+ if (e.ContentState == SvnNotifyState.Conflicted) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Conflict {0}"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Added {0}"), file);
+ }
+ break;
+ case SvnNotifyAction.Restore:
+ actiondesc = string.Format (GettextCatalog.GetString ("Restored '{0}'"), file);
+ break;
+ case SvnNotifyAction.Revert:
+ actiondesc = string.Format (GettextCatalog.GetString ("Reverted '{0}'"), file);
+ break;
+ case SvnNotifyAction.RevertFailed:
+ actiondesc = string.Format (GettextCatalog.GetString ("Failed to revert '{0}' -- try updating instead."), file);
+ break;
+ case SvnNotifyAction.Resolved:
+ actiondesc = string.Format (GettextCatalog.GetString ("Resolved conflict state of '{0}'"), file);
+ break;
+ case SvnNotifyAction.Add:
+ if (e.MimeTypeIsBinary) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Add (bin) '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Add '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.Delete:
+ actiondesc = string.Format (GettextCatalog.GetString ("Delete '{0}'"), file);
+ break;
+
+ case SvnNotifyAction.UpdateUpdate:
+ actiondesc = string.Format (GettextCatalog.GetString ("Update '{0}'"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.UpdateExternal:
+ actiondesc = string.Format (GettextCatalog.GetString ("Fetching external item into '{0}'"), file);
+ break;
+ case SvnNotifyAction.UpdateCompleted: // TODO
+ actiondesc = GettextCatalog.GetString ("Finished");
+ break;
+ case SvnNotifyAction.StatusExternal:
+ actiondesc = string.Format (GettextCatalog.GetString ("Performing status on external item at '{0}'"), file);
+ break;
+ case SvnNotifyAction.StatusCompleted:
+ actiondesc = string.Format (GettextCatalog.GetString ("Status against revision: '{0}'"), e.Revision);
+ break;
+
+ case SvnNotifyAction.CommitDeleted:
+ actiondesc = string.Format (GettextCatalog.GetString ("Deleting {0}"), file);
+ break;
+ case SvnNotifyAction.CommitModified:
+ actiondesc = string.Format (GettextCatalog.GetString ("Sending {0}"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.CommitAdded:
+ if (e.MimeTypeIsBinary) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Adding (bin) '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Adding '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.CommitReplaced:
+ actiondesc = string.Format (GettextCatalog.GetString ("Replacing {0}"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.CommitSendData:
+ if (!notifData.SendingData) {
+ notifData.SendingData = true;
+ actiondesc = GettextCatalog.GetString ("Transmitting file data");
+ } else {
+ actiondesc = ".";
+ skipEol = true;
+ }
+ break;
+
+ case SvnNotifyAction.LockLocked:
+ actiondesc = string.Format (GettextCatalog.GetString ("'{0}' locked by user '{1}'."), file, e.Lock.Owner);
+ break;
+ case SvnNotifyAction.LockUnlocked:
+ actiondesc = string.Format (GettextCatalog.GetString ("'{0}' unlocked."), file);
+ break;
+ default:
+ actiondesc = e.Action + " " + file;
+ break;
}
if (monitor != null) {
Commit: 04c6c78b9ae418424b7614bca3337d73970b20db
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:08:12 GMT
URL: https://github.com/mono/monodevelop/commit/04c6c78b9ae418424b7614bca3337d73970b20db
[Subversion] Win32 speed-ups by using some already evaluated properties.
Changed paths:
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -439,15 +439,14 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
ent.RemoteUpdateCommitAuthor, "(unavailable)", null);
}
- SvnSchedule sched = ent.WorkingCopyInfo != null ? ent.WorkingCopyInfo.Schedule : SvnSchedule.Normal;
- VersionStatus status = ConvertStatus (sched, ent.LocalContentStatus);
+ VersionStatus status = ConvertStatus (SvnSchedule.Normal, ent.LocalContentStatus);
bool readOnly = File.Exists (ent.FullPath) && (File.GetAttributes (ent.FullPath) & FileAttributes.ReadOnly) != 0;
if (ent.WorkingCopyInfo != null) {
- if (ent.RemoteLock != null || ent.WorkingCopyInfo.LockToken != null) {
+ if (ent.RemoteLock != null || ent.LocalLock != null) {
status |= VersionStatus.LockRequired;
- if (ent.WorkingCopyInfo.LockToken != null || (ent.RemoteLock != null && ent.RemoteLock.Token != null))
+ if (ent.LocalLock != null || (ent.RemoteLock != null && ent.RemoteLock.Token != null))
status |= VersionStatus.LockOwned;
else
status |= VersionStatus.Locked;
@@ -459,7 +458,7 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
string repoPath = ent.Uri != null ? ent.Uri.ToString () : null;
SvnRevision newRev = null;
if (ent.WorkingCopyInfo != null)
- newRev = new SvnRevision (repo, (int) ent.WorkingCopyInfo.Revision);
+ newRev = new SvnRevision (repo, (int) ent.Revision);
var ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
status, newRev,
Commit: c61d24ee61b0951cc19e28276811093fae3ae160
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:08:31 GMT
URL: https://github.com/mono/monodevelop/commit/c61d24ee61b0951cc19e28276811093fae3ae160
Merge branch 'master' of https://github.com/mono/monodevelop
Changed paths:
M main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
M main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
M main/src/addins/ChangeLogAddIn/ChangeLogService.cs
M main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
M main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
Modified: main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
===================================================================
@@ -33,12 +33,12 @@
namespace MonoDevelop.ChangeLogAddIn
{
- internal partial class AddLogEntryDialog : Gtk.Dialog
+ partial class AddLogEntryDialog : Dialog
{
- ListStore store;
- Dictionary<ChangeLogEntry,string> changes = new Dictionary<ChangeLogEntry,string> ();
- TextMark editMark;
- TextTag oldTextTag;
+ readonly ListStore store;
+ readonly Dictionary<ChangeLogEntry, string> changes = new Dictionary<ChangeLogEntry, string> ();
+ readonly TextMark editMark;
+ readonly TextTag oldTextTag;
bool loading;
public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
@@ -52,8 +52,8 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
Pango.TabArray tabs = new Pango.TabArray (1, true);
tabs.SetTab (0, Pango.TabAlign.Left, GetStringWidth (" ") * 4);
textview.Tabs = tabs;
- textview.SizeRequested += delegate (object o, SizeRequestedArgs args) {
- textview.WidthRequest = GetStringWidth (string.Empty.PadRight (80));
+ textview.SizeRequested += delegate {
+ textview.WidthRequest = GetStringWidth (String.Empty.PadRight (80));
};
font.Dispose ();
@@ -66,9 +66,9 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
foreach (ChangeLogEntry ce in entries.Values) {
Gdk.Pixbuf pic;
if (ce.CantGenerate)
- pic = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.DialogWarning, IconSize.Menu);
else if (ce.IsNew)
- pic = ImageService.GetPixbuf (Gtk.Stock.New, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.New, IconSize.Menu);
else
pic = null;
store.AppendValues (ce, pic, ce.File);
@@ -78,7 +78,7 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
TreeIter it;
editMark = textview.Buffer.CreateMark (null, textview.Buffer.EndIter, false);
- oldTextTag = new Gtk.TextTag ("readonly");
+ oldTextTag = new TextTag ("readonly");
oldTextTag.Foreground = "gray";
oldTextTag.Editable = false;
textview.Buffer.TagTable.Add (oldTextTag);
@@ -87,10 +87,10 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
fileList.Selection.SelectIter (it);
}
- private int GetStringWidth (string str)
+ int GetStringWidth (string str)
{
int width, height;
- Pango.Layout layout = new Pango.Layout (textview.PangoContext);
+ var layout = new Pango.Layout (textview.PangoContext);
layout.SetText (str);
layout.GetPixelSize (out width, out height);
layout.Dispose ();
@@ -105,7 +105,7 @@ public void OnSelectionChanged (object s, EventArgs a)
textview.Sensitive = false;
} else {
textview.Sensitive = true;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
boxNewFile.Visible = ce.IsNew && !ce.CantGenerate;
boxNoFile.Visible = ce.CantGenerate;
loading = true;
@@ -132,7 +132,7 @@ public void OnTextChanged (object s, EventArgs a)
TreeIter it;
if (!fileList.Selection.GetSelected (out it))
return;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
changes [ce] = textview.Buffer.GetText (textview.Buffer.StartIter, textview.Buffer.GetIterAtMark (editMark), true);
}
Modified: main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
===================================================================
@@ -64,23 +64,21 @@ protected override void Update(CommandInfo info)
info.Enabled = false;
}
- private string GetSelectedFile()
+ static string GetSelectedFile()
{
if (IdeApp.Workbench.ActiveDocument != null) {
string fn = IdeApp.Workbench.ActiveDocument.FileName;
if (fn != null && Path.GetFileName (fn) != "ChangeLog")
return fn;
}
- ProjectFile file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
+ var file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
if (file != null)
return file.FilePath;
- SystemFile sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
- if (sf != null)
- return sf.Path;
- return null;
+ var sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
+ return sf != null ? sf.Path : null;
}
- private void InsertEntry(Document document)
+ static void InsertEntry(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return;
@@ -92,7 +90,7 @@ private void InsertEntry(Document document)
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
int pos = GetHeaderEndPosition (document);
- if (pos > 0 && selectedFileNameDirectory.StartsWith(changeLogFileNameDirectory)) {
+ if (pos > 0 && selectedFileNameDirectory.StartsWith (changeLogFileNameDirectory, StringComparison.Ordinal)) {
string text = "\t* "
+ selectedFileName.Substring(changeLogFileNameDirectory.Length + 1) + ": "
+ eol + eol;
@@ -107,7 +105,7 @@ private void InsertEntry(Document document)
}
}
- private bool InsertHeader (Document document)
+ static bool InsertHeader (Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return false;
@@ -133,7 +131,7 @@ private bool InsertHeader (Document document)
return true;
}
- private int GetHeaderEndPosition(Document document)
+ static int GetHeaderEndPosition(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return 0;
@@ -143,10 +141,10 @@ private int GetHeaderEndPosition(Document document)
string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
- return text.IndexOf (eol + eol);
+ return text.IndexOf (eol + eol, StringComparison.Ordinal);
}
- private Document GetActiveChangeLogDocument()
+ static Document GetActiveChangeLogDocument()
{
string file = GetSelectedFile ();
if (file == null)
Modified: main/src/addins/ChangeLogAddIn/ChangeLogService.cs
===================================================================
@@ -115,11 +115,7 @@ public static string GetChangeLogForFile (string baseCommitPath, string file)
public static CommitMessageStyle GetMessageStyle (SolutionItem item)
{
- ChangeLogPolicy policy;
- if (item != null)
- policy = GetPolicy (item);
- else
- policy = new ChangeLogPolicy ();
+ ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy ();
return policy.MessageStyle;
}
Modified: main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
===================================================================
@@ -32,7 +32,6 @@
using MonoDevelop.VersionControl;
using MonoDevelop.Core;
using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide;
using MonoDevelop.Projects;
@@ -40,10 +39,10 @@ namespace MonoDevelop.ChangeLogAddIn
{
public class CommitDialogExtensionWidget: CommitDialogExtension
{
- HBox box = new HBox ();
- VBox vbox = new VBox ();
- Button logButton;
- Button optionsButton;
+ readonly HBox box = new HBox ();
+ readonly VBox vbox = new VBox ();
+ readonly Button logButton;
+ readonly Button optionsButton;
ChangeSet cset;
Label msgLabel;
Label pathLabel;
@@ -65,18 +64,18 @@ public CommitDialogExtensionWidget()
optionsButton = new Button (GettextCatalog.GetString ("Options..."));
optionsButton.Clicked += OnClickOptions;
- VBox aux = new VBox ();
+ var aux = new VBox ();
box.PackStart (aux, false, false, 3);
- HBox haux = new HBox ();
+ var haux = new HBox ();
haux.Spacing = 6;
aux.PackStart (haux, false, false, 0);
haux.PackStart (logButton, false, false, 0);
haux.PackStart (optionsButton, false, false, 0);
}
- public override bool Initialize (ChangeSet cset)
+ public override bool Initialize (ChangeSet changeSet)
{
- this.cset = cset;
+ cset = changeSet;
msgLabel = new Label ();
pathLabel = new Label ();
msgLabel.Xalign = 0;
@@ -227,7 +226,7 @@ void GenerateLogEntries ()
requireComment = false;
foreach (ChangeSetItem item in cset.Items) {
- MonoDevelop.Projects.SolutionItem parentItem;
+ SolutionItem parentItem;
ChangeLogPolicy policy;
string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath,
out parentItem, out policy);
@@ -246,8 +245,7 @@ void GenerateLogEntries ()
if (string.IsNullOrEmpty (item.Comment) && !item.IsDirectory) {
uncommentedCount++;
- if (policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry)
- requireComment = true;
+ requireComment |= policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry;
}
ChangeLogEntry entry;
@@ -260,15 +258,14 @@ void GenerateLogEntries ()
if (cantGenerate)
unknownFileCount++;
- if (!File.Exists (logf))
- entry.IsNew = true;
+ entry.IsNew |= !File.Exists (logf);
entries [logf] = entry;
}
entry.Items.Add (item);
}
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.TabsAsSpaces = false;
format.TabWidth = 8;
format.MaxColumns = 70;
@@ -283,19 +280,19 @@ void GenerateLogEntries ()
void OnClickButton (object s, EventArgs args)
{
if (notConfigured) {
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
return;
}
var dlg = new AddLogEntryDialog (entries);
- MessageService.ShowCustomDialog (dlg, (Gtk.Window) Toplevel);
+ MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
}
void OnClickOptions (object s, EventArgs args)
{
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
}
Modified: main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.ChangeLogAddIn
class OldChangeLogData
{
[ItemProperty]
- ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
+ readonly ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
OldChangeLogData ()
{
@@ -55,7 +55,7 @@ public static void Migrate (SolutionItem entry)
if (entry.ParentFolder != null)
Migrate (entry.ParentFolder);
- OldChangeLogData data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
+ var data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
if (data == null)
return;
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
===================================================================
@@ -43,11 +43,14 @@ public override Widget CreatePanelWidget ()
public override void Initialize (OptionsDialog dialog, object dataObject)
{
- if (dataObject is SolutionItem)
- OldChangeLogData.Migrate ((SolutionItem)dataObject);
- else if (dataObject is Solution)
- OldChangeLogData.Migrate (((Solution)dataObject).RootFolder);
-
+ var solutionItem = dataObject as SolutionItem;
+ if (solutionItem != null)
+ OldChangeLogData.Migrate (solutionItem);
+ else {
+ var solution = dataObject as Solution;
+ if (solution != null)
+ OldChangeLogData.Migrate (solution.RootFolder);
+ }
base.Initialize (dialog, dataObject);
}
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
===================================================================
@@ -25,16 +25,14 @@
//
//
-using System;
using MonoDevelop.Projects;
using MonoDevelop.VersionControl;
-using MonoDevelop.Ide;
namespace MonoDevelop.ChangeLogAddIn
{
partial class ProjectOptionPanelWidget : Gtk.Bin
{
- ProjectOptionPanel parent;
+ readonly ProjectOptionPanel parent;
CommitMessageStyle style;
public ProjectOptionPanelWidget (ProjectOptionPanel parent)
@@ -60,13 +58,13 @@ public void LoadFrom (ChangeLogPolicy policy)
break;
}
- this.checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
- this.checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
+ checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
+ checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
style = new CommitMessageStyle ();
style.CopyFrom (policy.MessageStyle);
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.MaxColumns = 70;
format.Style = style;
Commit: 2ee0ea417f09a81c078a7aaf20c45d831618247d
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:08:50 GMT
URL: https://github.com/mono/monodevelop/commit/2ee0ea417f09a81c078a7aaf20c45d831618247d
[ConsoleProgressMonitor] Add comment about .NET 4.5 way of avoiding that exception.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs
===================================================================
@@ -50,6 +50,7 @@ public class ConsoleProgressMonitor: NullProgressMonitor
public ConsoleProgressMonitor () : this (Console.Out)
{
//TODO: can we efficiently update Console.WindowWidth when it changes?
+ // TODO: Use Console.IsOutputRedirected in .NET 4.5.
try {
columns = Console.WindowWidth;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches