Skip to content

Instantly share code, notes, and snippets.

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index ee46f27..36a5cef 100644
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -1198,11 +1198,9 @@ stop_debugger_thread ()
if (!debugger_thread_exited)
{
#ifdef HOST_WIN32
- if (WAIT_TIMEOUT == WaitForSingleObject(debugger_thread_exited_cond, 0)) {
- mono_mutex_unlock (&debugger_thread_exited_mutex);
diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml
index 6776a1b..0158b43 100644
--- a/main/src/addins/CBinding/CBinding.addin.xml
+++ b/main/src/addins/CBinding/CBinding.addin.xml
@@ -15,6 +15,7 @@
<Addin id = "Deployment.Linux" version = "2.6"/>
<Addin id = "SourceEditor2" version = "2.6" />
<Addin id = "DesignerSupport" version = "2.6" />
+ <Addin id = "Refactoring" version = "2.6" />
</Dependencies>
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<!-- This is required by the subversion add-in for windows, which uses a mixed mode assembly built with .NET 2.0 -->
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0"/>
</startup>
</configuration>
diff --git a/bin/modules/c-autodetect.jam b/bin/modules/c-autodetect.jam
index ac6af3e..e384296 100644
--- a/bin/modules/c-autodetect.jam
+++ b/bin/modules/c-autodetect.jam
@@ -56,7 +56,7 @@ rule C.ToolChain THE_COMPILER : THE_PLATFORM : THE_CONFIG
return ;
}
- Exit * No supported build platform found on this computer. ;
+ echo "warning: No supported C build platform found on this computer." ;
--- /home/levi/Code/unity/boo-md-addins/src/Boo.MonoDevelop.Util/BooCompletionTextEditorExtension.boo (base)
+++ /home/levi/Code/unity/boo-md-addins/src/Boo.MonoDevelop.Util/BooCompletionTextEditorExtension.boo (working copy)
@@ -1,6 +1,7 @@
namespace Boo.MonoDevelop.Util.Completion
import System
+import System.Linq.Enumerable
import System.Threading
import System.Text.RegularExpressions
diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 21235cb..140611e 100644
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -7700,24 +7700,24 @@ mono_class_get_nested_types (MonoClass* klass, gpointer *iter)
if (!klass->type_token)
klass->nested_classes_inited = TRUE;
mono_loader_lock ();
if (!klass->nested_classes_inited) {
i = mono_metadata_nesting_typedef (klass->image, klass->type_token, 1);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1de9864..600aa8c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3057,7 +3057,6 @@ gtk_tree_view_button_release (GtkWidget *widget,
if (event->button == 1)
{
- gtk_grab_remove (widget);
if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node &&
+ matchstandins = [tostandin(f) for f in match._files]
+ if (match._files):
+ if (matchstandins and matchstandins == match._files):
+ print 'Early out'
+ try:
+ return super(lfiles_repo, self).status(node1, node2, match,
+ listignored, listclean, listunknown, listsubrepos)
+ except TypeError:
+ return super(lfiles_repo, self).status(node1, node2, match,
+ listignored, listclean, listunknown)
@Tak
Tak / reposetup.py.diff
Created January 8, 2012 09:50
Fix parser warning: redefinition of unused 'node' from line 14
--- /home/levi/Code/hg/hgext/largefiles/reposetup.py (base)
+++ /home/levi/Code/hg/hgext/largefiles/reposetup.py (working copy)
@@ -11,7 +11,7 @@
import types
import os
-from mercurial import context, error, manifest, match as match_, node, util
+from mercurial import context, error, manifest, match as match_, node as node_, util
from mercurial.i18n import _
@Tak
Tak / lfcommands.py.diff
Created January 8, 2012 15:27
Issue 3092: Give clearer error messages
--- /home/levi/Code/hg/hgext/largefiles/lfcommands.py (base)
+++ /home/levi/Code/hg/hgext/largefiles/lfcommands.py (working copy)
@@ -237,7 +237,9 @@
dstfiles.append(lfutil.standin(f))
# largefile in manifest if it has not been removed/renamed
if f in ctx.manifest():
- if 'l' in ctx.filectx(f).flags():
+ fctx = ctx.filectx(f)
+ if 'l' in fctx.flags():
+ renamed = fctx.renamed()