From e8e4dcf68dbbc122d06bfa6ffa315964be909211 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Tue, 1 Mar 2016 15:18:22 +0100 Subject: [PATCH] Bug 1252446 - Sync global .gitignore and .hgignore for various missing unwanted files. r=gps DONTBUILD MozReview-Commit-ID: 8OoQ8Ep2JMl --HG-- extra : rebase_source : 454cea343266744397017755e5cbde029dacc950 --- .gitignore | 16 +++++++++++++++- .hgignore | 12 +++++++++--- testing/talos/.gitignore | 8 -------- 3 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 testing/talos/.gitignore diff --git a/.gitignore b/.gitignore index 0e8a98c45f22..9e7f4f6a210b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ tags ID .DS_Store* *.pdb +*.egg-info # Allow the id locale directory for loop ('ID' matches this normally) !browser/extensions/loop/chrome/locale/id @@ -87,6 +88,17 @@ testing/web-platform/sync/ # Android Gradle artifacts. mobile/android/gradle/.gradle +# XCode project cruft +embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/xcuserdata +embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/xcuserdata + +# Ignore mozharness execution files +testing/mozharness/.tox/ +testing/mozharness/build/ +testing/mozharness/logs/ +testing/mozharness/.coverage +testing/mozharness/nosetests.xml + # Ignore node_modules from eslint-plugin-mozilla testing/eslint-plugin-mozilla/node_modules/ @@ -100,4 +112,6 @@ testing/talos/.Python testing/talos/bin/ testing/talos/include/ testing/talos/lib/ -testing/talos/talos/page_load_test/tp5n/ +testing/talos/talos/tests/tp5n.zip +testing/talos/talos/tests/tp5n +testing/talos/talos/tests/devtools/damp.manifest.develop diff --git a/.hgignore b/.hgignore index e81bf3b693e5..83a351aa9884 100644 --- a/.hgignore +++ b/.hgignore @@ -6,7 +6,8 @@ (?i)(^|/)TAGS$ (^|/)ID$ (^|/)\.DS_Store$ -.*\.egg-info +\.pdb +\.egg-info # Vim swap files. ^\.sw.$ @@ -106,8 +107,11 @@ GPATH ^embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/xcuserdata # Ignore mozharness execution files -^testing/mozharness/logs/ +^testing/mozharness/.tox/ ^testing/mozharness/build/ +^testing/mozharness/logs/ +^testing/mozharness/.coverage +^testing/mozharness/nosetests.xml # Ignore tox generated dir .tox/ @@ -125,4 +129,6 @@ GPATH ^testing/talos/bin/ ^testing/talos/include/ ^testing/talos/lib/ -^testing/talos/talos/page_load_test/tp5n/ +^testing/talos/talos/tests/tp5n.zip +^testing/talos/talos/tests/tp5n +^testing/talos/talos/tests/devtools/damp.manifest.develop diff --git a/testing/talos/.gitignore b/testing/talos/.gitignore deleted file mode 100644 index 0f5592a8f0c9..000000000000 --- a/testing/talos/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.Python -bin/ -include/ -lib/ -talos.egg-info -talos/tests/tp5n.zip -talos/tests/tp5n -talos/tests/devtools/damp.manifest.develop