{"thread":{"id":"9417","subject":"[StGIT PATCH] Teach StGIT about core.excludesfile","startedAt":"2007-08-07T02:40:37Z","lastAt":"2007-08-07T02:40:37Z","messageCount":1,"participants":["Karl Hasselström"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"50072","messageId":"20070807024037.11009.14569.stgit@yoghurt","threadId":"9417","inReplyTo":null,"subject":"[StGIT PATCH] Teach StGIT about core.excludesfile","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-07T02:40:37Z","receivedAt":"2007-08-07T02:40:37Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"If there is a core.excludesfile option specified, let StGIT take\nexclude patterns from that file, since that's what the docs say, and\nwhat everyone else is already doing.\n\nSigned-off-by: Karl Hasselström <kha@treskal.com>\n\n---\n\n stgit/git.py |   27 +++++++++++++++------------\n 1 files changed, 15 insertions(+), 12 deletions(-)\n\ndiff --git a/stgit/git.py b/stgit/git.py\nindex 72bf889..57c156e 100644\n--- a/stgit/git.py\n+++ b/stgit/git.py\n@@ -216,6 +216,13 @@ def __run(cmd, args=None):\n         return r\n     return 0\n \n+def exclude_files():\n+    files = [os.path.join(basedir.get(), 'info', 'exclude')]\n+    user_exclude = config.get('core.excludesfile')\n+    if user_exclude:\n+        files.append(user_exclude)\n+    return files\n+\n def tree_status(files = None, tree_id = 'HEAD', unknown = False,\n                   noexclude = True, verbose = False, diff_flags = []):\n     \"\"\"Returns a list of pairs - [status, filename]\n@@ -231,20 +238,16 @@ def tree_status(files = None, tree_id = 'HEAD', unknown = False,\n \n     # unknown files\n     if unknown:\n-        exclude_file = os.path.join(basedir.get(), 'info', 'exclude')\n-        base_exclude = ['--exclude=%s' % s for s in\n-                        ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]\n-        base_exclude.append('--exclude-per-directory=.gitignore')\n-\n-        if os.path.exists(exclude_file):\n-            extra_exclude = ['--exclude-from=%s' % exclude_file]\n-        else:\n-            extra_exclude = []\n         if noexclude:\n-            extra_exclude = base_exclude = []\n-\n+            exclude = []\n+        else:\n+            exclude = (['--exclude=%s' % s for s in\n+                        ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]\n+                       + ['--exclude-per-directory=.gitignore']\n+                       + ['--exclude-from=%s' % fn for fn in exclude_files()\n+                          if os.path.exists(fn)])\n         lines = _output_lines(['git-ls-files', '--others', '--directory']\n-                        + base_exclude + extra_exclude)\n+                              + exclude)\n         cache_files += [('?', line.strip()) for line in lines]\n \n     # conflicted files\n"}]}