# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2015-05-27 16:34:00
# Node ID d02f4b3e71f5abb95dee5459437717057f0d1dfe
# Parent  475eae3497af2dd702b320dd234e0967624a43df

match: break boolean expressions into one operand per line

This makes it much easier to spot both the operators ('and'/'or') and
the operands.

diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -225,13 +225,16 @@ class match(object):
         if dir in self._excluderoots:
             return False
         parentdirs = None
-        if (self._includeroots and dir not in self._includeroots and
-                dir not in self._includedirs):
+        if (self._includeroots and
+            dir not in self._includeroots and
+            dir not in self._includedirs):
             parentdirs = list(util.finddirs(dir))
             if not any(parent in self._includeroots for parent in parentdirs):
                 return False
-        return (not self._fileroots or '.' in self._fileroots or
-                dir in self._fileroots or dir in self._dirs or
+        return (not self._fileroots or
+                '.' in self._fileroots or
+                dir in self._fileroots or
+                dir in self._dirs or
                 any(parentdir in self._fileroots
                     for parentdir in parentdirs or util.finddirs(dir)))