Bug 965120 - Use .clang-format to set tree default format; r=gps

iaxat · Jan 30, 2014 · c58033f · c58033f
1 parent 00f0c1a
commit c58033f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1 @@
+BasedOnStyle: Mozilla
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -1,2 +1,3 @@
 \mfbt/
 \js/
+\media/
diff --git a/tools/mach_commands.py b/tools/mach_commands.py
@@ -356,7 +356,7 @@ def clang_format(self, show=False):
         from subprocess import Popen, PIPE
         p1 = Popen(["hg", "diff", "-U0", "-r", "tip^", "--include", "glob:**.c", "--include", "glob:**.cpp",
                    "--include", "glob:**.h", "--exclude", "listfile:.clang-format-ignore"], stdout=PIPE)
-        args = [sys.executable, clang_format_diff, "-p1", "-style=Mozilla"]
+        args = [sys.executable, clang_format_diff, "-p1"]
         if not show:
            args.append("-i")
         p2 = Popen(args, stdin=p1.stdout)
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     \mfbt/
     \js/
+    \media/