Bug 1252446 - Sync global .gitignore and .hgignore for various missing unwanted files. r?gps draft
authorHenrik Skupin <mail@hskupin.info>
Tue, 01 Mar 2016 15:18:22 +0100
changeset 336063 90c5b413ac7f2a58ed84558a1563021054494116
parent 335732 a3f70cbceb6c77d529e720d0aefa6c86b181c63b
child 515291 e477aab57fba4ed1d45a000db86a66c88879920e
push id11959
push userbmo:hskupin@gmail.com
push dateWed, 02 Mar 2016 09:06:22 +0000
reviewersgps
bugs1252446
milestone47.0a1
Bug 1252446 - Sync global .gitignore and .hgignore for various missing unwanted files. r?gps MozReview-Commit-ID: 8OoQ8Ep2JMl
.gitignore
.hgignore
testing/talos/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -4,16 +4,17 @@
 *~
 *.pyc
 *.pyo
 TAGS
 tags
 ID
 .DS_Store*
 *.pdb
+*.egg-info
 
 # Allow the id locale directory for loop ('ID' matches this normally)
 !browser/extensions/loop/chrome/locale/id
 
 # Vim swap files.
 .*.sw[a-z]
 
 # Emacs directory variable files.
@@ -82,22 +83,35 @@ GSYMS
 GPATH
 
 # Git clone directory for updating web-platform-tests
 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/
 
 # Ignore talos virtualenv and tp5n files.
 # The tp5n set is supposed to be decompressed at
 # testing/talos/talos/page_load_test/tp5n in order to run tests like tps
 # locally. Similarly, running talos requires a Python package virtual
 # environment. Both the virtual environment and tp5n files end up littering
 # the status command, so we ignore them.
 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
--- a/.hgignore
+++ b/.hgignore
@@ -1,17 +1,18 @@
 # .hgignore - List of filenames hg should ignore
 
 # Filenames that should be ignored wherever they appear
 ~$
 \.py(c|o)$
 (?i)(^|/)TAGS$
 (^|/)ID$
 (^|/)\.DS_Store$
-.*\.egg-info
+\.pdb
+\.egg-info
 
 # Vim swap files.
 ^\.sw.$
 .[^/]*\.sw.$
 
 # Emacs directory variable files.
 \.dir-locals\.el
 
@@ -101,18 +102,21 @@ GPATH
 # 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/build/
+^testing/mozharness/.coverage
+^testing/mozharness/nosetests.xml
 
 # Ignore tox generated dir
 .tox/
 
 # Ignore node_modules from eslint-plugin-mozilla
 ^testing/eslint-plugin-mozilla/node_modules/
 
 # Ignore talos virtualenv and tp5n files.
@@ -120,9 +124,11 @@ GPATH
 # testing/talos/talos/page_load_test/tp5n in order to run tests like tps
 # locally. Similarly, running talos requires a Python package virtual
 # environment. Both the virtual environment and tp5n files end up littering
 # the status command, so we ignore them.
 ^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
deleted file mode 100644
--- 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