# HG changeset patch # User Matt Mackall # Date 1300891318 18000 # Node ID f3c4421e121c2bc8528e414b188a9404b8edc95c # Parent ce341da8537c40442fd0666b3158cc6abb2140e1 osutil: fix up check-code issues diff -r ce341da8537c -r f3c4421e121c contrib/check-code.py --- a/contrib/check-code.py Wed Mar 23 09:34:22 2011 -0500 +++ b/contrib/check-code.py Wed Mar 23 09:41:58 2011 -0500 @@ -177,7 +177,7 @@ (r'\([^\)]+\) \w+', "use (int)foo, not (int) foo"), (r'\S+ (\+\+|--)', "use foo++, not foo ++"), (r'\w,\w', "missing whitespace after ,"), - (r'\w[+/*]\w', "missing whitespace in expression"), + (r'^[^#]\w[+/*]\w', "missing whitespace in expression"), (r'^#\s+\w', "use #foo, not # foo"), (r'[^\n]\Z', "no trailing newline"), ] diff -r ce341da8537c -r f3c4421e121c mercurial/osutil.c --- a/mercurial/osutil.c Wed Mar 23 09:34:22 2011 -0500 +++ b/mercurial/osutil.c Wed Mar 23 09:41:58 2011 -0500 @@ -519,14 +519,14 @@ static PyObject *isgui(PyObject *self) { - CFDictionaryRef dict = CGSessionCopyCurrentDictionary(); + CFDictionaryRef dict = CGSessionCopyCurrentDictionary(); - if (dict != NULL) { - CFRelease(dict); - return Py_True; - } else { - return Py_False; - } + if (dict != NULL) { + CFRelease(dict); + return Py_True; + } else { + return Py_False; + } } #endif @@ -541,10 +541,10 @@ "On error, this function may raise either a WindowsError or an IOError."}, #endif #ifdef __APPLE__ - { - "isgui", (PyCFunction)isgui, METH_NOARGS, - "Is a CoreGraphics session available?" - }, + { + "isgui", (PyCFunction)isgui, METH_NOARGS, + "Is a CoreGraphics session available?" + }, #endif {NULL, NULL} };