From f3901cbd8a22185477f30faa31832796853620a1 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Fri, 25 Nov 2022 08:28:10 -0500
Subject: [PATCH] defuzz 107.0 attempt 1

---
 patches/bootstrap-without-vcs.patch   | 18 ++++++-----------
 patches/ui-patches/firefox-view.patch | 29 +++++++++------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch
index d213d70..68db89f 100644
--- a/patches/bootstrap-without-vcs.patch
+++ b/patches/bootstrap-without-vcs.patch
@@ -1,8 +1,6 @@
-diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
-index 0c5ecbf..d9a6d9d 100644
 --- a/python/mozboot/mozboot/bootstrap.py
 +++ b/python/mozboot/mozboot/bootstrap.py
-@@ -550,10 +550,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
+@@ -619,10 +619,7 @@ def current_firefox_checkout(env, hg: Op
              break
          path = path.parent
  
@@ -14,8 +12,6 @@ index 0c5ecbf..d9a6d9d 100644
  
  
  def update_git_tools(git: Optional[Path], root_state_dir: Path):
-diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py
-index dd31f53..6f0087a 100644
 --- a/python/mozversioncontrol/mozversioncontrol/__init__.py
 +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
 @@ -684,6 +684,29 @@ class GitRepository(Repository):
@@ -48,7 +44,7 @@ index dd31f53..6f0087a 100644
  def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
      """Get a repository object for the repository at `path`.
      If `path` is not a known VCS repository, raise an exception.
-@@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
+@@ -697,7 +720,7 @@ def get_repository_object(path: Optional
      elif (path / ".git").exists():
          return GitRepository(path, git=git)
      else:
@@ -57,7 +53,7 @@ index dd31f53..6f0087a 100644
  
  
  def get_repository_from_build_config(config):
-@@ -721,6 +744,8 @@ def get_repository_from_build_config(config):
+@@ -721,6 +744,8 @@ def get_repository_from_build_config(con
          return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"])
      elif flavor == "git":
          return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
@@ -66,12 +62,10 @@ index dd31f53..6f0087a 100644
      else:
          raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)
  
-diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
-index 016578b..7525139 100644
 --- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
 +++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
-@@ -168,6 +168,43 @@ class GitRepository(Repository):
-         self.run("checkout", ref)
+@@ -495,6 +495,43 @@ class GitRepository(Repository):
+             raise
  
  
 +class LocalRepository(Repository):
@@ -114,7 +108,7 @@ index 016578b..7525139 100644
  def get_repository(path):
      """Get a repository object for the repository at `path`.
      If `path` is not a known VCS repository, raise an exception.
-@@ -178,7 +215,7 @@ def get_repository(path):
+@@ -505,7 +542,7 @@ def get_repository(path):
          elif os.path.exists(os.path.join(path, ".git")):
              return GitRepository(path)
  
diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch
index a6708c1..1d3391f 100644
--- a/patches/ui-patches/firefox-view.patch
+++ b/patches/ui-patches/firefox-view.patch
@@ -1,8 +1,6 @@
-diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
-index 30c9145..5e0eda8 100644
 --- a/browser/components/customizableui/CustomizableUI.jsm
 +++ b/browser/components/customizableui/CustomizableUI.jsm
-@@ -274,7 +274,6 @@ var CustomizableUIInternal = {
+@@ -277,7 +277,6 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -10,7 +8,7 @@ index 30c9145..5e0eda8 100644
            "tabbrowser-tabs",
            "new-tab-button",
            "alltabs-button",
-@@ -602,18 +601,6 @@ var CustomizableUIInternal = {
+@@ -605,18 +604,6 @@ var CustomizableUIInternal = {
          navbarPlacements.splice(newPosition, 0, "save-to-pocket-button");
        }
      }
@@ -29,8 +27,6 @@ index 30c9145..5e0eda8 100644
    },
  
    _updateForNewProtonVersion() {
-diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
-index 2fe5208..057481b 100644
 --- a/browser/components/firefoxview/firefoxview.html
 +++ b/browser/components/firefoxview/firefoxview.html
 @@ -113,7 +113,7 @@
@@ -51,13 +47,11 @@ index 2fe5208..057481b 100644
          <template id="colorways-no-collection-template">
            <div class="content-container">
              <div id="no-current-colorway-collection-notice" data-l10n-id="firefoxview-no-current-colorway-collection"></div>
-diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
-index 520c092..c0b2669 100644
 --- a/browser/components/firefoxview/firefoxview.mjs
 +++ b/browser/components/firefoxview/firefoxview.mjs
-@@ -4,7 +4,26 @@
- 
- "use strict";
+@@ -28,7 +28,26 @@ const MediaQueryDOMSorting = {
+   },
+ };
  
 +function onPrefChange() {
 +  document.getElementById("tab-pickup-container").hidden =
@@ -82,15 +76,12 @@ index 520c092..c0b2669 100644
    Services.telemetry.setEventRecordingEnabled("firefoxview", true);
    Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
    document.getElementById("recently-closed-tabs-container").onLoad();
-diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-index 616839d..f849f60 100644
 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
 +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -78,56 +78,6 @@ const BASE_MESSAGES = () => [
-     },
+@@ -82,56 +82,6 @@ const BASE_MESSAGES = () => [
      trigger: { id: "protectionsPanelOpen" },
    },
--  {
+   {
 -    id: "CFR_FIREFOX_VIEW",
 -    groups: ["cfr"],
 -    template: "cfr_doorhanger",
@@ -140,13 +131,13 @@ index 616839d..f849f60 100644
 -    targeting:
 -      "!inMr2022Holdback && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet",
 -  },
-   {
+-  {
      id: "FX_MR_106_UPGRADE",
      template: "spotlight",
-diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml
+     targeting: "true",
 --- a/toolkit/components/nimbus/FeatureManifest.yaml
 +++ b/toolkit/components/nimbus/FeatureManifest.yaml
-@@ -638,10 +638,6 @@ majorRelease2022:
+@@ -663,10 +663,6 @@ majorRelease2022:
        type: boolean
        fallbackPref: "browser.theme.colorway-closet"
        description: "Whether or not to show the colorway closet modal"