Browse Source

fixes for Winodws gitlab checkin

Frank-Rainer Grahl 4 months ago
parent
commit
c4db00a5d7

+ 15 - 0
mozilla-release/patches/1402387-0-58a1.patch

@@ -0,0 +1,15 @@
+# HG changeset patch
+# User Jiel Selmani <jselmanovski1@myseneca.ca>
+# Date 1506881680 14400
+# Node ID 11f27f6d5059ada236bfb63bd4811377ccbb3fbe
+# Parent  8abe279fd9530705b75f07e21ed3302cbc99a963
+Bug 1402387 - CamelCased all React component files in /devtools/client/jsonview/components/;r=pbro
+
+MozReview-Commit-ID: CaUAREYn7eP
+
+diff --git a/devtools/client/jsonview/components/headers.js b/devtools/client/jsonview/components/headers2.js
+rename from devtools/client/jsonview/components/headers.js
+rename to devtools/client/jsonview/components/headers2.js
+diff --git a/devtools/client/jsonview/components/reps/toolbar.js b/devtools/client/jsonview/components/reps/toolbar2.js
+rename from devtools/client/jsonview/components/reps/toolbar.js
+rename to devtools/client/jsonview/components/reps/toolbar2.js

+ 4 - 4
mozilla-release/patches/1402387-58a1.patch → mozilla-release/patches/1402387-1-58a1.patch

@@ -29,8 +29,8 @@ diff --git a/devtools/client/dom/content/components/main-toolbar.js b/devtools/c
  const { fetchProperties } = require("../actions/grips");
  const { setVisibilityFilter } = require("../actions/filter");
  
-diff --git a/devtools/client/jsonview/components/headers.js b/devtools/client/jsonview/components/Headers.js
-rename from devtools/client/jsonview/components/headers.js
+diff --git a/devtools/client/jsonview/components/headers2.js b/devtools/client/jsonview/components/Headers.js
+rename from devtools/client/jsonview/components/headers2.js
 rename to devtools/client/jsonview/components/Headers.js
 diff --git a/devtools/client/jsonview/components/headers-panel.js b/devtools/client/jsonview/components/HeadersPanel.js
 rename from devtools/client/jsonview/components/headers-panel.js
@@ -164,8 +164,8 @@ diff --git a/devtools/client/jsonview/components/moz.build b/devtools/client/jso
 +    'SearchBox.js',
 +    'TextPanel.js'
  )
-diff --git a/devtools/client/jsonview/components/reps/toolbar.js b/devtools/client/jsonview/components/reps/Toolbar.js
-rename from devtools/client/jsonview/components/reps/toolbar.js
+diff --git a/devtools/client/jsonview/components/reps/toolbar2.js b/devtools/client/jsonview/components/reps/Toolbar.js
+rename from devtools/client/jsonview/components/reps/toolbar2.js
 rename to devtools/client/jsonview/components/reps/Toolbar.js
 diff --git a/devtools/client/jsonview/components/reps/moz.build b/devtools/client/jsonview/components/reps/moz.build
 --- a/devtools/client/jsonview/components/reps/moz.build

+ 24 - 0
mozilla-release/patches/1402389-0-58a1.patch

@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Patrick Brosset <pbrosset@mozilla.com>
+# Date 1507539934 -7200
+# Node ID 2ece41a76b0c270b66b35d23434f799fb13b0c1f
+# Parent  6502812f59eb534b02e67cb492c36122c1101cb2
+Bug 1402389 - CamelCase all React components oin devtools/client/memory/components; r=ystartsev+600802
+
+MozReview-Commit-ID: 7xYrykIkLIv
+
+diff --git a/devtools/client/memory/components/census.js b/devtools/client/memory/components/census2.js
+rename from devtools/client/memory/components/census.js
+rename to devtools/client/memory/components/census2.js
+diff --git a/devtools/client/memory/components/heap.js b/devtools/client/memory/components/heap2.js
+rename from devtools/client/memory/components/heap.js
+rename to devtools/client/memory/components/heap2.js
+diff --git a/devtools/client/memory/components/individuals.js b/devtools/client/memory/components/individuals2.js
+rename from devtools/client/memory/components/individuals.js
+rename to devtools/client/memory/components/individuals2.js
+diff --git a/devtools/client/memory/components/list.js b/devtools/client/memory/components/list2.js
+rename from devtools/client/memory/components/list.js
+rename to devtools/client/memory/components/list2.js
+diff --git a/devtools/client/memory/components/toolbar.js b/devtools/client/memory/components/toolbar2.js
+rename from devtools/client/memory/components/toolbar.js
+rename to devtools/client/memory/components/toolbar2.js

+ 13 - 13
mozilla-release/patches/1402389-58a1.patch → mozilla-release/patches/1402389-1-58a1.patch

@@ -35,10 +35,10 @@ diff --git a/devtools/client/memory/app.js b/devtools/client/memory/app.js
    propTypes: appModel,
  
    childContextTypes: {
-diff --git a/devtools/client/memory/components/census.js b/devtools/client/memory/components/Census.js
-rename from devtools/client/memory/components/census.js
+diff --git a/devtools/client/memory/components/census2.js b/devtools/client/memory/components/Census.js
+rename from devtools/client/memory/components/census2.js
 rename to devtools/client/memory/components/Census.js
---- a/devtools/client/memory/components/census.js
+--- a/devtools/client/memory/components/census2.js
 +++ b/devtools/client/memory/components/Census.js
 @@ -1,17 +1,17 @@
  /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -95,10 +95,10 @@ rename to devtools/client/memory/components/DominatorTreeHeader.js
 diff --git a/devtools/client/memory/components/dominator-tree-item.js b/devtools/client/memory/components/DominatorTreeItem.js
 rename from devtools/client/memory/components/dominator-tree-item.js
 rename to devtools/client/memory/components/DominatorTreeItem.js
-diff --git a/devtools/client/memory/components/heap.js b/devtools/client/memory/components/Heap.js
-rename from devtools/client/memory/components/heap.js
+diff --git a/devtools/client/memory/components/heap2.js b/devtools/client/memory/components/Heap.js
+rename from devtools/client/memory/components/heap2.js
 rename to devtools/client/memory/components/Heap.js
---- a/devtools/client/memory/components/heap.js
+--- a/devtools/client/memory/components/heap2.js
 +++ b/devtools/client/memory/components/Heap.js
 @@ -1,25 +1,25 @@
  /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -134,10 +134,10 @@ rename to devtools/client/memory/components/Heap.js
    censusState,
    treeMapState,
    dominatorTreeState,
-diff --git a/devtools/client/memory/components/individuals.js b/devtools/client/memory/components/Individuals.js
-rename from devtools/client/memory/components/individuals.js
+diff --git a/devtools/client/memory/components/individuals2.js b/devtools/client/memory/components/Individuals.js
+rename from devtools/client/memory/components/individuals2.js
 rename to devtools/client/memory/components/Individuals.js
---- a/devtools/client/memory/components/individuals.js
+--- a/devtools/client/memory/components/individuals2.js
 +++ b/devtools/client/memory/components/Individuals.js
 @@ -1,17 +1,17 @@
  /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -161,8 +161,8 @@ rename to devtools/client/memory/components/Individuals.js
 diff --git a/devtools/client/memory/components/individuals-header.js b/devtools/client/memory/components/IndividualsHeader.js
 rename from devtools/client/memory/components/individuals-header.js
 rename to devtools/client/memory/components/IndividualsHeader.js
-diff --git a/devtools/client/memory/components/list.js b/devtools/client/memory/components/List.js
-rename from devtools/client/memory/components/list.js
+diff --git a/devtools/client/memory/components/list2.js b/devtools/client/memory/components/List.js
+rename from devtools/client/memory/components/list2.js
 rename to devtools/client/memory/components/List.js
 diff --git a/devtools/client/memory/components/shortest-paths.js b/devtools/client/memory/components/ShortestPaths.js
 rename from devtools/client/memory/components/shortest-paths.js
@@ -170,8 +170,8 @@ rename to devtools/client/memory/components/ShortestPaths.js
 diff --git a/devtools/client/memory/components/snapshot-list-item.js b/devtools/client/memory/components/SnapshotListItem.js
 rename from devtools/client/memory/components/snapshot-list-item.js
 rename to devtools/client/memory/components/SnapshotListItem.js
-diff --git a/devtools/client/memory/components/toolbar.js b/devtools/client/memory/components/Toolbar.js
-rename from devtools/client/memory/components/toolbar.js
+diff --git a/devtools/client/memory/components/toolbar2.js b/devtools/client/memory/components/Toolbar.js
+rename from devtools/client/memory/components/toolbar2.js
 rename to devtools/client/memory/components/Toolbar.js
 diff --git a/devtools/client/memory/components/tree-map.js b/devtools/client/memory/components/TreeMap.js
 rename from devtools/client/memory/components/tree-map.js

+ 15 - 0
mozilla-release/patches/1402390-0-58a1.patch

@@ -0,0 +1,15 @@
+# HG changeset patch
+# User Miguel Useche <migueluseche@mozilla-hispano.org>
+# Date 1508121963 14400
+# Node ID 9473b60e5eeb8279bebe21edf7b4a00e821997a4
+# Parent  60e4ba22e9db016861a125d79d6256236a03062c
+Bug 1402390 - CamelCase all React component files in \devtools\client\netmonitor\src\components\. r=pbro
+
+MozReview-Commit-ID: LseEecjdU7I
+
+diff --git a/devtools/client/netmonitor/src/components/app.js b/devtools/client/netmonitor/src/components/app2.js
+rename from devtools/client/netmonitor/src/components/app.js
+rename to devtools/client/netmonitor/src/components/app2.js
+diff --git a/devtools/client/netmonitor/src/components/toolbar.js b/devtools/client/netmonitor/src/components/toolbar2.js
+rename from devtools/client/netmonitor/src/components/toolbar.js
+rename to devtools/client/netmonitor/src/components/toolbar2.js

+ 5 - 5
mozilla-release/patches/1402390-58a1.patch → mozilla-release/patches/1402390-1-58a1.patch

@@ -51,10 +51,10 @@ diff --git a/devtools/client/netmonitor/index.html b/devtools/client/netmonitor/
  
        // Configure store/state object.
        let connector = new Connector();
-diff --git a/devtools/client/netmonitor/src/components/app.js b/devtools/client/netmonitor/src/components/App.js
-rename from devtools/client/netmonitor/src/components/app.js
+diff --git a/devtools/client/netmonitor/src/components/app2.js b/devtools/client/netmonitor/src/components/App.js
+rename from devtools/client/netmonitor/src/components/app2.js
 rename to devtools/client/netmonitor/src/components/App.js
---- a/devtools/client/netmonitor/src/components/app.js
+--- a/devtools/client/netmonitor/src/components/app2.js
 +++ b/devtools/client/netmonitor/src/components/App.js
 @@ -7,18 +7,18 @@
  const {
@@ -579,8 +579,8 @@ rename to devtools/client/netmonitor/src/components/TimingsPanel.js
  /*
   * Timings panel component
   * Display timeline bars that shows the total wait time for various stages
-diff --git a/devtools/client/netmonitor/src/components/toolbar.js b/devtools/client/netmonitor/src/components/Toolbar.js
-rename from devtools/client/netmonitor/src/components/toolbar.js
+diff --git a/devtools/client/netmonitor/src/components/toolbar2.js b/devtools/client/netmonitor/src/components/Toolbar.js
+rename from devtools/client/netmonitor/src/components/toolbar2.js
 rename to devtools/client/netmonitor/src/components/Toolbar.js
 diff --git a/devtools/client/netmonitor/src/components/moz.build b/devtools/client/netmonitor/src/components/moz.build
 --- a/devtools/client/netmonitor/src/components/moz.build

+ 18 - 0
mozilla-release/patches/1402391-0-58a1.patch

@@ -0,0 +1,18 @@
+# HG changeset patch
+# User Miguel Useche <migueluseche@mozilla-hispano.org>
+# Date 1507604180 14400
+# Node ID 672c8297a9b4a9967c24bec456597b03458f90c7
+# Parent  84b1c1ac0c07fd9fa95820e7d2c093a68f88377a
+Bug 1402391 - CamelCase all React component files in \devtools\client\responsive.html\src\components\. r=jdescottes
+
+MozReview-Commit-ID: Am14gw4EugN
+
+diff --git a/devtools/client/responsive.html/components/browser.js b/devtools/client/responsive.html/components/browser2.js
+rename from devtools/client/responsive.html/components/browser.js
+rename to devtools/client/responsive.html/components/browser2.js
+diff --git a/devtools/client/responsive.html/components/viewport2.js b/devtools/client/responsive.html/components/viewport2.js
+rename from devtools/client/responsive.html/components/viewport.js
+rename to devtools/client/responsive.html/components/viewport2.js
+diff --git a/devtools/client/responsive.html/components/viewports.js b/devtools/client/responsive.html/components/viewports2.js
+rename from devtools/client/responsive.html/components/viewports.js
+rename to devtools/client/responsive.html/components/viewports2.js

+ 8 - 8
mozilla-release/patches/1402391-58a1.patch → mozilla-release/patches/1402391-1-58a1.patch

@@ -33,8 +33,8 @@ diff --git a/devtools/client/responsive.html/app.js b/devtools/client/responsive
    propTypes: {
      devices: PropTypes.shape(Types.devices).isRequired,
      dispatch: PropTypes.func.isRequired,
-diff --git a/devtools/client/responsive.html/components/browser.js b/devtools/client/responsive.html/components/Browser.js
-rename from devtools/client/responsive.html/components/browser.js
+diff --git a/devtools/client/responsive.html/components/browser2.js b/devtools/client/responsive.html/components/Browser.js
+rename from devtools/client/responsive.html/components/browser2.js
 rename to devtools/client/responsive.html/components/Browser.js
 diff --git a/devtools/client/responsive.html/components/device-adder.js b/devtools/client/responsive.html/components/DeviceAdder.js
 rename from devtools/client/responsive.html/components/device-adder.js
@@ -145,10 +145,10 @@ rename to devtools/client/responsive.html/components/ResizableViewport.js
  
    displayName: "ResizableViewport",
  
-diff --git a/devtools/client/responsive.html/components/viewport.js b/devtools/client/responsive.html/components/Viewport.js
-rename from devtools/client/responsive.html/components/viewport.js
+diff --git a/devtools/client/responsive.html/components/viewport2.js b/devtools/client/responsive.html/components/Viewport.js
+rename from devtools/client/responsive.html/components/viewport2.js
 rename to devtools/client/responsive.html/components/Viewport.js
---- a/devtools/client/responsive.html/components/viewport.js
+--- a/devtools/client/responsive.html/components/viewport2.js
 +++ b/devtools/client/responsive.html/components/Viewport.js
 @@ -3,18 +3,18 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -198,10 +198,10 @@ rename to devtools/client/responsive.html/components/ViewportToolbar.js
      devices: PropTypes.shape(Types.devices).isRequired,
      viewport: PropTypes.shape(Types.viewport).isRequired,
      onChangeDevice: PropTypes.func.isRequired,
-diff --git a/devtools/client/responsive.html/components/viewports.js b/devtools/client/responsive.html/components/Viewports.js
-rename from devtools/client/responsive.html/components/viewports.js
+diff --git a/devtools/client/responsive.html/components/viewports2.js b/devtools/client/responsive.html/components/Viewports.js
+rename from devtools/client/responsive.html/components/viewports2.js
 rename to devtools/client/responsive.html/components/Viewports.js
---- a/devtools/client/responsive.html/components/viewports.js
+--- a/devtools/client/responsive.html/components/viewports2.js
 +++ b/devtools/client/responsive.html/components/Viewports.js
 @@ -3,17 +3,17 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

+ 30 - 0
mozilla-release/patches/1402394-0-58a1.patch

@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Dan Epstein <dan.epstein@outlook.com>
+# Date 1506489133 14400
+# Node ID 941327d5a29b148e4a2920f1929020a435285016
+# Parent  80944af83ce6aeec42c8732e7619e954e8e75c18
+Bug 1402394 CamelCase all React component files in \devtools\client\shared\components\. r=pbro
+
+MozReview-Commit-ID: HH4mbqB6RTK
+
+diff --git a/devtools/client/shared/components/frame.js b/devtools/client/shared/components/frame2.js
+rename from devtools/client/shared/components/frame.js
+rename to devtools/client/shared/components/frame2.js
+diff --git a/devtools/client/shared/components/tree.js b/devtools/client/shared/components/tree2.js
+rename from devtools/client/shared/components/tree.js
+rename to devtools/client/shared/components/tree2.js
+diff --git a/devtools/client/shared/components/splitter/draggable.js b/devtools/client/shared/components/splitter/draggable2.js
+rename from devtools/client/shared/components/splitter/draggable.js
+rename to devtools/client/shared/components/splitter/draggable2.js
+diff --git a/devtools/client/shared/components/tabs/tabbar.css b/devtools/client/shared/components/tabs/tabbar2.css
+rename from devtools/client/shared/components/tabs/tabbar.css
+rename to devtools/client/shared/components/tabs/tabbar2.css
+diff --git a/devtools/client/shared/components/tabs/tabbar.js b/devtools/client/shared/components/tabs/tabbar2.js
+rename from devtools/client/shared/components/tabs/tabbar.js
+rename to devtools/client/shared/components/tabs/tabbar2.js
+diff --git a/devtools/client/shared/components/tabs/tabs.css b/devtools/client/shared/components/tabs/tabs2.css
+rename from devtools/client/shared/components/tabs/tabs.css
+rename to devtools/client/shared/components/tabs/tabs2.css
+diff --git a/devtools/client/shared/components/tabs/tabs.js b/devtools/client/shared/components/tabs/tabs2.js
+rename from devtools/client/shared/components/tabs/tabs.js
+rename to devtools/client/shared/components/tabs/tabs2.js

+ 15 - 15
mozilla-release/patches/1402394-58a1.patch → mozilla-release/patches/1402394-1-58a1.patch

@@ -711,8 +711,8 @@ diff --git a/devtools/client/performance/components/waterfall-tree.js b/devtools
 diff --git a/devtools/client/shared/components/autocomplete-popup.js b/devtools/client/shared/components/AutoCompletePopup.js
 rename from devtools/client/shared/components/autocomplete-popup.js
 rename to devtools/client/shared/components/AutoCompletePopup.js
-diff --git a/devtools/client/shared/components/frame.js b/devtools/client/shared/components/Frame.js
-rename from devtools/client/shared/components/frame.js
+diff --git a/devtools/client/shared/components/frame2.js b/devtools/client/shared/components/Frame.js
+rename from devtools/client/shared/components/frame2.js
 rename to devtools/client/shared/components/Frame.js
 diff --git a/devtools/client/shared/components/h-split-box.js b/devtools/client/shared/components/HSplitBox.js
 rename from devtools/client/shared/components/h-split-box.js
@@ -777,8 +777,8 @@ rename to devtools/client/shared/components/StackTrace.js
  
    propTypes: {
      asyncCause: PropTypes.string.isRequired
-diff --git a/devtools/client/shared/components/tree.js b/devtools/client/shared/components/Tree.js
-rename from devtools/client/shared/components/tree.js
+diff --git a/devtools/client/shared/components/tree2.js b/devtools/client/shared/components/Tree.js
+rename from devtools/client/shared/components/tree2.js
 rename to devtools/client/shared/components/Tree.js
 diff --git a/devtools/client/shared/components/moz.build b/devtools/client/shared/components/moz.build
 --- a/devtools/client/shared/components/moz.build
@@ -816,8 +816,8 @@ diff --git a/devtools/client/shared/components/moz.build b/devtools/client/share
  
  MOCHITEST_CHROME_MANIFESTS += ['test/mochitest/chrome.ini']
  BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
-diff --git a/devtools/client/shared/components/splitter/draggable.js b/devtools/client/shared/components/splitter/Draggable.js
-rename from devtools/client/shared/components/splitter/draggable.js
+diff --git a/devtools/client/shared/components/splitter/draggable2.js b/devtools/client/shared/components/splitter/Draggable.js
+rename from devtools/client/shared/components/splitter/draggable2.js
 rename to devtools/client/shared/components/splitter/Draggable.js
 diff --git a/devtools/client/shared/components/splitter/split-box.css b/devtools/client/shared/components/splitter/SplitBox.css
 rename from devtools/client/shared/components/splitter/split-box.css
@@ -864,13 +864,13 @@ diff --git a/devtools/client/shared/components/splitter/moz.build b/devtools/cli
 +    'SplitBox.css',
 +    'SplitBox.js',
  )
-diff --git a/devtools/client/shared/components/tabs/tabbar.css b/devtools/client/shared/components/tabs/TabBar.css
-rename from devtools/client/shared/components/tabs/tabbar.css
+diff --git a/devtools/client/shared/components/tabs/tabbar2.css b/devtools/client/shared/components/tabs/TabBar.css
+rename from devtools/client/shared/components/tabs/tabbar2.css
 rename to devtools/client/shared/components/tabs/TabBar.css
-diff --git a/devtools/client/shared/components/tabs/tabbar.js b/devtools/client/shared/components/tabs/TabBar.js
-rename from devtools/client/shared/components/tabs/tabbar.js
+diff --git a/devtools/client/shared/components/tabs/tabbar2.js b/devtools/client/shared/components/tabs/TabBar.js
+rename from devtools/client/shared/components/tabs/tabbar2.js
 rename to devtools/client/shared/components/tabs/TabBar.js
---- a/devtools/client/shared/components/tabs/tabbar.js
+--- a/devtools/client/shared/components/tabs/tabbar2.js
 +++ b/devtools/client/shared/components/tabs/TabBar.js
 @@ -4,17 +4,17 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -891,11 +891,11 @@ rename to devtools/client/shared/components/tabs/TabBar.js
  const { div } = DOM;
  
  /**
-diff --git a/devtools/client/shared/components/tabs/tabs.css b/devtools/client/shared/components/tabs/Tabs.css
-rename from devtools/client/shared/components/tabs/tabs.css
+diff --git a/devtools/client/shared/components/tabs/tabs2.css b/devtools/client/shared/components/tabs/Tabs.css
+rename from devtools/client/shared/components/tabs/tabs2.css
 rename to devtools/client/shared/components/tabs/Tabs.css
-diff --git a/devtools/client/shared/components/tabs/tabs.js b/devtools/client/shared/components/tabs/Tabs.js
-rename from devtools/client/shared/components/tabs/tabs.js
+diff --git a/devtools/client/shared/components/tabs/tabs2.js b/devtools/client/shared/components/tabs/Tabs.js
+rename from devtools/client/shared/components/tabs/tabs2.js
 rename to devtools/client/shared/components/tabs/Tabs.js
 diff --git a/devtools/client/shared/components/tabs/moz.build b/devtools/client/shared/components/tabs/moz.build
 --- a/devtools/client/shared/components/tabs/moz.build

+ 12 - 0
mozilla-release/patches/1402397-0-58a1.patch

@@ -0,0 +1,12 @@
+# HG changeset patch
+# User Darren M. OConnell <doconnell@cursived.com>
+# Date 1506593371 -7200
+# Node ID 3a66690fca8017d0c1098ce04de1a7b9cf36d449
+# Parent  7fec2afa1012621a2a11f647c58c0454d4ebb60c
+Bug 1402397 - CamelCase React component files in /devtools/client/webconsole/new-console-output; r=pbro
+
+MozReview-Commit-ID: JcsKS8w0Pec
+
+diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message2.js
+rename from devtools/client/webconsole/new-console-output/components/message.js
+rename to devtools/client/webconsole/new-console-output/components/message2.js

+ 3 - 3
mozilla-release/patches/1402397-58a1.patch → mozilla-release/patches/1402397-1-58a1.patch

@@ -93,10 +93,10 @@ rename to devtools/client/webconsole/new-console-output/components/FilterCheckbo
 diff --git a/devtools/client/webconsole/new-console-output/components/grip-message-body.js b/devtools/client/webconsole/new-console-output/components/GripMessageBody.js
 rename from devtools/client/webconsole/new-console-output/components/grip-message-body.js
 rename to devtools/client/webconsole/new-console-output/components/GripMessageBody.js
-diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/Message.js
-rename from devtools/client/webconsole/new-console-output/components/message.js
+diff --git a/devtools/client/webconsole/new-console-output/components/message2.js b/devtools/client/webconsole/new-console-output/components/Message.js
+rename from devtools/client/webconsole/new-console-output/components/message2.js
 rename to devtools/client/webconsole/new-console-output/components/Message.js
---- a/devtools/client/webconsole/new-console-output/components/message.js
+--- a/devtools/client/webconsole/new-console-output/components/message2.js
 +++ b/devtools/client/webconsole/new-console-output/components/Message.js
 @@ -11,20 +11,20 @@ const {
    createClass,

+ 31 - 0
mozilla-release/patches/1411199-0-58a1.patch

@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Maxime Vaillancourt <maxvaillancourt1@gmail.com>
+# Date 1508900361 14400
+# Node ID a8526281637dec379cd45d6c766ddb99296da9c4
+# Parent  7a20f825dfa610ee80c18d3a35a18fc2425ac464
+Bug 1411199 - CamelCase all aboutdebugging component files. r=jdescottes
+
+diff --git a/devtools/client/aboutdebugging/components/aboutdebugging.js b/devtools/client/aboutdebugging/components/aboutdebugging2.js
+rename from devtools/client/aboutdebugging/components/aboutdebugging.js
+rename to devtools/client/aboutdebugging/components/aboutdebugging2.js
+diff --git a/devtools/client/aboutdebugging/components/addons/controls.js b/devtools/client/aboutdebugging/components/addons/controls2.js
+rename from devtools/client/aboutdebugging/components/addons/controls.js
+rename to devtools/client/aboutdebugging/components/addons/controls2.js
+diff --git a/devtools/client/aboutdebugging/components/addons/panel.js b/devtools/client/aboutdebugging/components/addons/panel2.js
+rename from devtools/client/aboutdebugging/components/addons/panel.js
+rename to devtools/client/aboutdebugging/components/addons/panel2.js
+diff --git a/devtools/client/aboutdebugging/components/addons/target.js b/devtools/client/aboutdebugging/components/addons/target2.js
+rename from devtools/client/aboutdebugging/components/addons/target.js
+rename to devtools/client/aboutdebugging/components/addons/target2.js
+diff --git a/devtools/client/aboutdebugging/components/tabs/panel.js b/devtools/client/aboutdebugging/components/tabs/panel2.js
+rename from devtools/client/aboutdebugging/components/tabs/panel.js
+rename to devtools/client/aboutdebugging/components/tabs/panel2.js
+diff --git a/devtools/client/aboutdebugging/components/tabs/target.js b/devtools/client/aboutdebugging/components/tabs/target2.js
+rename from devtools/client/aboutdebugging/components/tabs/target.js
+rename to devtools/client/aboutdebugging/components/tabs/target2.js
+diff --git a/devtools/client/aboutdebugging/components/workers/panel.js b/devtools/client/aboutdebugging/components/workers/panel2.js
+rename from devtools/client/aboutdebugging/components/workers/panel.js
+rename to devtools/client/aboutdebugging/components/workers/panel2.js
+diff --git a/devtools/client/aboutdebugging/components/workers/target.js b/devtools/client/aboutdebugging/components/workers/target2.js
+rename from devtools/client/aboutdebugging/components/workers/target.js
+rename to devtools/client/aboutdebugging/components/workers/target2.js

+ 21 - 21
mozilla-release/patches/1411199-58a1.patch → mozilla-release/patches/1411199-1-58a1.patch

@@ -5,10 +5,10 @@
 # Parent  7a20f825dfa610ee80c18d3a35a18fc2425ac464
 Bug 1411199 - CamelCase all aboutdebugging component files. r=jdescottes
 
-diff --git a/devtools/client/aboutdebugging/components/aboutdebugging.js b/devtools/client/aboutdebugging/components/Aboutdebugging.js
-rename from devtools/client/aboutdebugging/components/aboutdebugging.js
+diff --git a/devtools/client/aboutdebugging/components/aboutdebugging2.js b/devtools/client/aboutdebugging/components/Aboutdebugging.js
+rename from devtools/client/aboutdebugging/components/aboutdebugging2.js
 rename to devtools/client/aboutdebugging/components/Aboutdebugging.js
---- a/devtools/client/aboutdebugging/components/aboutdebugging.js
+--- a/devtools/client/aboutdebugging/components/aboutdebugging2.js
 +++ b/devtools/client/aboutdebugging/components/Aboutdebugging.js
 @@ -5,24 +5,24 @@
  /* eslint-env browser */
@@ -72,10 +72,10 @@ rename to devtools/client/aboutdebugging/components/PanelMenuEntry.js
 diff --git a/devtools/client/aboutdebugging/components/target-list.js b/devtools/client/aboutdebugging/components/TargetList.js
 rename from devtools/client/aboutdebugging/components/target-list.js
 rename to devtools/client/aboutdebugging/components/TargetList.js
-diff --git a/devtools/client/aboutdebugging/components/addons/controls.js b/devtools/client/aboutdebugging/components/addons/Controls.js
-rename from devtools/client/aboutdebugging/components/addons/controls.js
+diff --git a/devtools/client/aboutdebugging/components/addons/controls2.js b/devtools/client/aboutdebugging/components/addons/Controls.js
+rename from devtools/client/aboutdebugging/components/addons/controls2.js
 rename to devtools/client/aboutdebugging/components/addons/Controls.js
---- a/devtools/client/aboutdebugging/components/addons/controls.js
+--- a/devtools/client/aboutdebugging/components/addons/controls2.js
 +++ b/devtools/client/aboutdebugging/components/addons/Controls.js
 @@ -9,17 +9,17 @@
  
@@ -99,10 +99,10 @@ rename to devtools/client/aboutdebugging/components/addons/Controls.js
 diff --git a/devtools/client/aboutdebugging/components/addons/install-error.js b/devtools/client/aboutdebugging/components/addons/InstallError.js
 rename from devtools/client/aboutdebugging/components/addons/install-error.js
 rename to devtools/client/aboutdebugging/components/addons/InstallError.js
-diff --git a/devtools/client/aboutdebugging/components/addons/panel.js b/devtools/client/aboutdebugging/components/addons/Panel.js
-rename from devtools/client/aboutdebugging/components/addons/panel.js
+diff --git a/devtools/client/aboutdebugging/components/addons/panel2.js b/devtools/client/aboutdebugging/components/addons/Panel.js
+rename from devtools/client/aboutdebugging/components/addons/panel2.js
 rename to devtools/client/aboutdebugging/components/addons/Panel.js
---- a/devtools/client/aboutdebugging/components/addons/panel.js
+--- a/devtools/client/aboutdebugging/components/addons/panel2.js
 +++ b/devtools/client/aboutdebugging/components/addons/Panel.js
 @@ -5,20 +5,20 @@
  "use strict";
@@ -129,8 +129,8 @@ rename to devtools/client/aboutdebugging/components/addons/Panel.js
    "chrome://devtools/locale/aboutdebugging.properties");
  
  const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
-diff --git a/devtools/client/aboutdebugging/components/addons/target.js b/devtools/client/aboutdebugging/components/addons/Target.js
-rename from devtools/client/aboutdebugging/components/addons/target.js
+diff --git a/devtools/client/aboutdebugging/components/addons/target2.js b/devtools/client/aboutdebugging/components/addons/Target.js
+rename from devtools/client/aboutdebugging/components/addons/target2.js
 rename to devtools/client/aboutdebugging/components/addons/Target.js
 diff --git a/devtools/client/aboutdebugging/components/addons/moz.build b/devtools/client/aboutdebugging/components/addons/moz.build
 --- a/devtools/client/aboutdebugging/components/addons/moz.build
@@ -173,10 +173,10 @@ diff --git a/devtools/client/aboutdebugging/components/moz.build b/devtools/clie
 +    'PanelMenuEntry.js',
 +    'TargetList.js',
  )
-diff --git a/devtools/client/aboutdebugging/components/tabs/panel.js b/devtools/client/aboutdebugging/components/tabs/Panel.js
-rename from devtools/client/aboutdebugging/components/tabs/panel.js
+diff --git a/devtools/client/aboutdebugging/components/tabs/panel2.js b/devtools/client/aboutdebugging/components/tabs/Panel.js
+rename from devtools/client/aboutdebugging/components/tabs/panel2.js
 rename to devtools/client/aboutdebugging/components/tabs/Panel.js
---- a/devtools/client/aboutdebugging/components/tabs/panel.js
+--- a/devtools/client/aboutdebugging/components/tabs/panel2.js
 +++ b/devtools/client/aboutdebugging/components/tabs/Panel.js
 @@ -5,19 +5,19 @@
  /* eslint-env browser */
@@ -201,8 +201,8 @@ rename to devtools/client/aboutdebugging/components/tabs/Panel.js
    "chrome://devtools/locale/aboutdebugging.properties");
  
  module.exports = createClass({
-diff --git a/devtools/client/aboutdebugging/components/tabs/target.js b/devtools/client/aboutdebugging/components/tabs/Target.js
-rename from devtools/client/aboutdebugging/components/tabs/target.js
+diff --git a/devtools/client/aboutdebugging/components/tabs/target2.js b/devtools/client/aboutdebugging/components/tabs/Target.js
+rename from devtools/client/aboutdebugging/components/tabs/target2.js
 rename to devtools/client/aboutdebugging/components/tabs/Target.js
 diff --git a/devtools/client/aboutdebugging/components/tabs/moz.build b/devtools/client/aboutdebugging/components/tabs/moz.build
 --- a/devtools/client/aboutdebugging/components/tabs/moz.build
@@ -221,10 +221,10 @@ diff --git a/devtools/client/aboutdebugging/components/tabs/moz.build b/devtools
 diff --git a/devtools/client/aboutdebugging/components/workers/multi-e10s-warning.js b/devtools/client/aboutdebugging/components/workers/MultiE10sWarning.js
 rename from devtools/client/aboutdebugging/components/workers/multi-e10s-warning.js
 rename to devtools/client/aboutdebugging/components/workers/MultiE10sWarning.js
-diff --git a/devtools/client/aboutdebugging/components/workers/panel.js b/devtools/client/aboutdebugging/components/workers/Panel.js
-rename from devtools/client/aboutdebugging/components/workers/panel.js
+diff --git a/devtools/client/aboutdebugging/components/workers/panel2.js b/devtools/client/aboutdebugging/components/workers/Panel.js
+rename from devtools/client/aboutdebugging/components/workers/panel2.js
 rename to devtools/client/aboutdebugging/components/workers/Panel.js
---- a/devtools/client/aboutdebugging/components/workers/panel.js
+--- a/devtools/client/aboutdebugging/components/workers/panel2.js
 +++ b/devtools/client/aboutdebugging/components/workers/Panel.js
 @@ -8,21 +8,21 @@ loader.lazyImporter(this, "PrivateBrowsi
    "resource://gre/modules/PrivateBrowsingUtils.jsm");
@@ -256,8 +256,8 @@ rename to devtools/client/aboutdebugging/components/workers/Panel.js
 diff --git a/devtools/client/aboutdebugging/components/workers/service-worker-target.js b/devtools/client/aboutdebugging/components/workers/ServiceWorkerTarget.js
 rename from devtools/client/aboutdebugging/components/workers/service-worker-target.js
 rename to devtools/client/aboutdebugging/components/workers/ServiceWorkerTarget.js
-diff --git a/devtools/client/aboutdebugging/components/workers/target.js b/devtools/client/aboutdebugging/components/workers/Target.js
-rename from devtools/client/aboutdebugging/components/workers/target.js
+diff --git a/devtools/client/aboutdebugging/components/workers/target2.js b/devtools/client/aboutdebugging/components/workers/Target.js
+rename from devtools/client/aboutdebugging/components/workers/target2.js
 rename to devtools/client/aboutdebugging/components/workers/Target.js
 diff --git a/devtools/client/aboutdebugging/components/workers/moz.build b/devtools/client/aboutdebugging/components/workers/moz.build
 --- a/devtools/client/aboutdebugging/components/workers/moz.build

+ 12 - 0
mozilla-release/patches/1420289-0-59a1.patch

@@ -0,0 +1,12 @@
+# HG changeset patch
+# User Alexandre Poirot <poirot.alex@gmail.com>
+# Date 1513189268 28800
+# Node ID 3dd0966303ca6d6fd06e30aeda5bbbbe573d16a5
+# Parent  775d2aff206995bea19c7ccebbd8230c4aff2beb
+Bug 1420289 - Lazy load optional React components from netmonitor. r=Honza
+
+MozReview-Commit-ID: 9kzmYrzafjj
+
+diff --git a/devtools/client/netmonitor/src/components/RequestListColumnRemoteIp.js b/devtools/client/netmonitor/src/components/RequestListColumnRemoteIp2.js
+rename from devtools/client/netmonitor/src/components/RequestListColumnRemoteIp.js
+rename to devtools/client/netmonitor/src/components/RequestListColumnRemoteIp2.js

+ 2 - 2
mozilla-release/patches/1420289-59a1.patch → mozilla-release/patches/1420289-1-59a1.patch

@@ -226,8 +226,8 @@ diff --git a/devtools/client/netmonitor/src/components/RequestList.js b/devtools
    connector,
    isEmpty,
  }) {
-diff --git a/devtools/client/netmonitor/src/components/RequestListColumnRemoteIp.js b/devtools/client/netmonitor/src/components/RequestListColumnRemoteIP.js
-rename from devtools/client/netmonitor/src/components/RequestListColumnRemoteIp.js
+diff --git a/devtools/client/netmonitor/src/components/RequestListColumnRemoteIp2.js b/devtools/client/netmonitor/src/components/RequestListColumnRemoteIP.js
+rename from devtools/client/netmonitor/src/components/RequestListColumnRemoteIp2.js
 rename to devtools/client/netmonitor/src/components/RequestListColumnRemoteIP.js
 diff --git a/devtools/client/netmonitor/src/components/RequestListContent.js b/devtools/client/netmonitor/src/components/RequestListContent.js
 --- a/devtools/client/netmonitor/src/components/RequestListContent.js

+ 3 - 3
mozilla-release/patches/1424701-59a1.patch

@@ -2,14 +2,13 @@
 # User Andrea Marchesini <amarchesini@mozilla.com>
 # Date 1515600249 -3600
 # Node ID 479b32d510f5963b8b4c74baa8ba45d47aa0776c
-# Parent  d7590bbdc118ece8ac7c3c1abc2b1f068482c433
+# Parent  56bb9b201f4d3fedaa86a086a1975467afcc8fec
 Bug 1424701 - Test for uploading files via ServiceWorker, r=bkelly
 
 diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/serviceworkers/mochitest.ini
 --- a/dom/workers/test/serviceworkers/mochitest.ini
 +++ b/dom/workers/test/serviceworkers/mochitest.ini
-@@ -339,8 +339,10 @@ tags = openwindow
- [test_update_missing_imported_script.html]
+@@ -341,8 +341,10 @@ tags = openwindow
  [test_workerUnregister.html]
  [test_workerUpdate.html]
  [test_workerupdatefoundevent.html]
@@ -17,6 +16,7 @@ diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/se
  [test_async_waituntil.html]
  [test_worker_reference_gc_timeout.html]
  [test_nofetch_handler.html]
+ [test_bad_script_cache.html]
 +[test_file_upload.html]
 +support-files = script_file_upload.js sw_file_upload.js server_file_upload.sjs
 diff --git a/dom/workers/test/serviceworkers/script_file_upload.js b/dom/workers/test/serviceworkers/script_file_upload.js

+ 1 - 1
mozilla-release/patches/1902935-seamonkey-credits-25320.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1712347236 0
-Bug 1898467 - Implement SeaMonkey about:credits. r=IanN
+Bug 1902935 - Implement SeaMonkey about:credits. r=IanN
 
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
 --- a/docshell/base/nsAboutRedirector.cpp

+ 16 - 8
mozilla-release/patches/series

@@ -86,7 +86,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1403486-58a1.patch
 1403831-58a1.patch
 1401343-58a1.patch
-1402394-58a1.patch
+1402394-0-58a1.patch
+1402394-1-58a1.patch
 1402237-58a1.patch
 1392533-58a1.patch
 1403866-58a1.patch
@@ -106,7 +107,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1385398-58a1.patch
 1399948-2-58a1.patch
 1403065-58a1.patch
-1402397-58a1.patch
+1402397-0-58a1.patch
+1402397-1-58a1.patch
 1403244-58a1.patch
 1383037-58a1.patch
 1398722-58a1.patch
@@ -117,7 +119,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1399589-2-58a1.patch
 1399589-3-58a1.patch
 1399589-4-58a1.patch
-1402387-58a1.patch
+1402387-0-58a1.patch
+1402387-1-58a1.patch
 1348960-58a1.patch
 1404197-58a1.patch
 1403641-1-58a1.patch
@@ -142,8 +145,10 @@ NOBUG-20170803-promisehelper-57a1.patch
 1405983-1-58a1.patch
 1405983-2-58a1.patch
 1168092-58a1.patch
-1402389-58a1.patch
-1402391-58a1.patch
+1402389-0-58a1.patch
+1402389-1-58a1.patch
+1402391-0-58a1.patch
+1402391-1-58a1.patch
 1407230-58a1.patch
 1400023-58a1.patch
 1404130-58a1.patch
@@ -209,7 +214,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1399493-58a1.patch
 1409684-58a1.patch
 1339800-58a1.patch
-1402390-58a1.patch
+1402390-0-58a1.patch
+1402390-1-58a1.patch
 1408143-58a1.patch
 1408468-1-58a1.patch
 1408468-2-58a1.patch
@@ -241,7 +247,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1251836-58a1.patch
 1410119-58a1.patch
 1411202-58a1.patch
-1411199-58a1.patch
+1411199-0-58a1.patch
+1411199-1-58a1.patch
 1409970-1-58a1.patch
 1409970-2-58a1.patch
 1409064-58a1.patch
@@ -701,7 +708,8 @@ NOBUG-20170803-promisehelper-57a1.patch
 1419366-59a1.patch
 1421992-4c-59a1.patch
 1426108-59a1.patch
-1420289-59a1.patch
+1420289-0-59a1.patch
+1420289-1-59a1.patch
 1425897-59a1.patch
 1365574-59a1.patch
 1402485-59a1.patch