Skip to content

Commit

Permalink
Merge Cyberfox 52.0 branch into master
Browse files Browse the repository at this point in the history
  • Loading branch information
InternalError503 committed Mar 6, 2017
1 parent 598c3bf commit 1fb7bca
Show file tree
Hide file tree
Showing 24,139 changed files with 1,986,779 additions and 942,601 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .cargo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config
21 changes: 7 additions & 14 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ browser/base/content/test/general/file_csp_block_all_mixedcontent.html
browser/base/content/test/urlbar/file_blank_but_not_blank.html
browser/base/content/newtab/**
browser/components/downloads/**
browser/components/feeds/**
browser/components/privatebrowsing/**
browser/components/sessionstore/**
browser/components/tabview/**
browser/components/translation/**
# generated files in cld2
browser/components/translation/cld2/cld-worker.js
browser/extensions/pdfjs/**
# generated or library files in pocket
browser/extensions/pocket/content/panels/js/tmpl.js
Expand All @@ -80,9 +80,9 @@ browser/locales/**
devtools/client/canvasdebugger/**
devtools/client/commandline/**
devtools/client/debugger/**
devtools/client/eyedropper/**
devtools/client/framework/**
!devtools/client/framework/selection.js
!devtools/client/framework/toolbox.js
devtools/client/jsonview/lib/**
devtools/client/memory/**
devtools/client/netmonitor/test/**
Expand All @@ -94,11 +94,6 @@ devtools/client/scratchpad/**
devtools/client/shadereditor/**
devtools/client/shared/*.jsm
devtools/client/shared/webgl-utils.js
devtools/client/shared/developer-toolbar.js
devtools/client/shared/components/test/**
devtools/client/shared/redux/middleware/test/**
devtools/client/shared/test/**
!devtools/client/shared/test/test-actor-registry.js
devtools/client/shared/widgets/*.jsm
devtools/client/sourceeditor/test/*.js
devtools/client/webaudioeditor/**
Expand All @@ -115,14 +110,15 @@ devtools/server/*.jsm
!devtools/server/main.js
!devtools/server/websocket-server.js
devtools/server/actors/**
!devtools/server/actors/csscoverage.js
!devtools/server/actors/inspector.js
!devtools/server/actors/highlighters/css-grid.js
!devtools/server/actors/highlighters/eye-dropper.js
!devtools/server/actors/layout.js
!devtools/server/actors/string.js
!devtools/server/actors/styles.js
!devtools/server/actors/webbrowser.js
!devtools/server/actors/webextension.js
!devtools/server/actors/styles.js
!devtools/server/actors/string.js
!devtools/server/actors/csscoverage.js
devtools/server/performance/**
devtools/server/tests/**
devtools/shared/*.js
Expand All @@ -133,8 +129,6 @@ devtools/shared/*.js
!devtools/shared/indentation.js
!devtools/shared/loader-plugin-raw.jsm
!devtools/shared/task.js
devtools/shared/*.jsm
!devtools/shared/Loader.jsm
devtools/shared/apps/**
devtools/shared/client/**
devtools/shared/discovery/**
Expand Down Expand Up @@ -242,7 +236,6 @@ toolkit/components/reader/JSDOMParser.js
# Uses preprocessing
toolkit/content/widgets/wizard.xml
toolkit/components/jsdownloads/src/DownloadIntegration.jsm
toolkit/components/search/nsSearchService.js
toolkit/components/url-classifier/**
toolkit/components/urlformatter/nsURLFormatter.js
toolkit/identity/FirefoxAccounts.jsm
Expand Down
12 changes: 0 additions & 12 deletions .eslintrc

This file was deleted.

14 changes: 14 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
"use strict";

module.exports = {
// When adding items to this file please check for effects on sub-directories.
"plugins": [
"mozilla"
],
"rules": {
"mozilla/import-globals": "warn",
},
"env": {
"es6": true
},
};
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[flake8]
# See http://pep8.readthedocs.io/en/latest/intro.html#configuration
ignore = E121, E123, E126, E133, E226, E241, E242, E704, W503, E402
max-line-length = 99
filename = *.py, +.lint
6 changes: 6 additions & 0 deletions .gdbinit
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ handle SIG32 noprint nostop pass
handle SIG33 noprint nostop pass
handle SIGPIPE noprint nostop pass

# Don't stop for certain other signals where it's not useful,
# such as the SIG64 signals triggered by the Linux
# sandboxing code on older kernels.
handle SIG38 noprint nostop pass
handle SIG64 noprint nostop pass

# Show the concrete types behind nsIFoo
set print object on

Expand Down
134 changes: 134 additions & 0 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
# .hgignore - List of filenames hg should ignore

# Filenames that should be ignored wherever they appear
~$
\.py(c|o)$
(?i)(^|/)TAGS$
(^|/)ID$
(^|/)\.DS_Store$
\.pdb
\.egg-info

# Vim swap files.
^\.sw.$
.[^/]*\.sw.$

# Emacs directory variable files.
\.dir-locals\.el

# User files that may appear at the root
^\.mozconfig
^mozconfig*
^configure$
^old-configure$
^config\.cache$
^config\.log$
^\.clang_complete
^\.?machrc$

# Empty marker file that's generated when we check out NSS
^security/manager/\.nss\.checkout$

# Build directories
^obj

# Build directories for js shell
_DBG\.OBJ/
_OPT\.OBJ/
^js/src/.*-obj/

# SpiderMonkey configury
^js/src/configure$
^js/src/old-configure$
^js/src/autom4te.cache$
# SpiderMonkey test result logs
^js/src/tests/results-.*\.(html|txt)$
^js/src/devtools/rootAnalysis/t/out

# Java HTML5 parser classes
^parser/html/java/(html|java)parser/

# SVN directories
\.svn/

# Ignore the files and directory that Eclipse IDE creates
\.project$
\.cproject$
\.settings/

# Ignore the files and directory that JetBrains IDEs create.
\.idea/
\.iml$

# Gradle cache.
^.gradle/

# Local Gradle configuration properties.
^local.properties$

# Python stuff installed at build time.
^python/psutil/.*\.so
^python/psutil/.*\.pyd
^python/psutil/build/

# Git repositories
.git/

# Ignore chrome.manifest files from the devtools loader
^devtools/client/chrome.manifest$
^devtools/shared/chrome.manifest$

# Ignore node_modules directories in devtools
^devtools/.*/node_modules/

# git checkout of libstagefright
^media/libstagefright/android$

# Tag files generated by GNU Global
GTAGS
GRTAGS
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 tox generated dir
.tox/

# Ignore node_modules
^tools/lint/eslint/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/tests/tp5n.zip
^testing/talos/talos/tests/tp5n
^testing/talos/talos/tests/devtools/damp.manifest.develop

# Ignore files created when running a reftest.
^lextab.py$

# tup database
^\.tup
Loading

0 comments on commit 1fb7bca

Please sign in to comment.