Chronological shuffle for 76a1

mozilla-release/patches/1607193-3-76a1.patch

@@ -2,7 +2,7 @@
 # User Mike Shal <mshal@mozilla.com>
 # Date 1584124468 0
 # Node ID 8ef0a54d7715018ad09e5b6b53d3321252422e44
-# Parent  fb39363714dd329a536f10dda30ddfbd810c9bd7
+# Parent  51da258108d8a52eb678718c534aca7158773c91
 Bug 1607193 - Remove l10n-check; r=firefox-build-system-reviewers,rstewart
 
 Depends on D66715
@@ -38,10 +38,10 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
  
  ident:
  	@printf 'fx_revision '
- 	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
+ 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
  	    '$(STAGEDIST)'/application.ini App SourceStamp
  	@printf 'buildid '
- 	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
+ 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
  	    '$(STAGEDIST)'/application.ini App BuildID
 -
 -# test target, depends on make package
@@ -62,7 +62,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
 --- a/toolkit/mozapps/installer/upload-files.mk
 +++ b/toolkit/mozapps/installer/upload-files.mk
-@@ -395,17 +395,17 @@ UPLOAD_FILES= \
+@@ -387,17 +387,17 @@ UPLOAD_FILES= \
    $(call QUOTED_WILDCARD,$(MOZ_TEST_PACKAGES_FILE)) \
    $(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
    $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) \

mozilla-release/patches/1621322-2-76a1.patch

@@ -2,7 +2,7 @@
 # User Steve Fink <sfink@mozilla.com>
 # Date 1584915138 0
 # Node ID 8f82ceefe18a00231207b54ccb9386d4f282b061
-# Parent  b83ae618c97ec42bfbbdbece83cacd4862c225d7
+# Parent  c56076148255712a8233653cc268f77fd14c2f38
 Bug 1621322 - Implement `mach lint --revset=REV` r=ahal
 
 In the process, fixed a few bugs:
@@ -211,7 +211,7 @@ diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/moz
  
          ``diff_filter`` works the same as `get_changed_files`.
          ``upstream`` is a remote ref to compare against. If unspecified,
-@@ -303,43 +306,47 @@ class HgRepository(Repository):
+@@ -306,43 +309,47 @@ class HgRepository(Repository):
              if e.errno != errno.ENOENT:
                  raise
  
@@ -275,10 +275,10 @@ diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/moz
  
      def add_remove_files(self, path):
          args = ['addremove', path]
-         if self.tool_version >= str('3.9'):
-             args = ['--config', 'extensions.automv='] + args
-         self._run(*args)
-@@ -425,24 +432,30 @@ class GitRepository(Repository):
+         m = re.search(r'\d+\.\d+', self.tool_version)
+         simplified_version = float(m.group(0)) if m else 0
+         if simplified_version >= 3.9:
+@@ -430,24 +437,30 @@ class GitRepository(Repository):
          ref = self._run('symbolic-ref', '-q', 'HEAD').strip()
          upstream = self._run('for-each-ref', '--format=%(upstream:short)', ref).strip()
  

mozilla-release/patches/1622789-76a1.patch

@@ -2,7 +2,7 @@
 # User Geoff Brown <gbrown@mozilla.com>
 # Date 1584551534 0
 # Node ID 98d7f9e4839f6e9047a63e93c55fd1eddd653c56
-# Parent  b16c2cdad2e83923aa1bc932dd32a84ba6247300
+# Parent  74548687887a45b078d0f9ac90e4b2be755dd482
 Bug 1622789 - Remove mozversioncontrol dependency on distutils; r=ahal
 
 Use mozfile.which instead of distutils.
@@ -80,10 +80,10 @@ diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/moz
          return False
  
      @abc.abstractproperty
-@@ -344,17 +342,19 @@ class HgRepository(Repository):
+@@ -340,17 +338,19 @@ class HgRepository(Repository):
+         if 'm' in df:
+             template += "{file_mods % '\\n{file}'}"
  
-     def get_outgoing_files(self, diff_filter='ADM', upstream='default'):
-         template = self._files_template(diff_filter)
          return self._run('outgoing', '-r', '.', '--quiet',
                           '--template', template, upstream, return_codes=(1,)).split()
  

mozilla-release/patches/1623132-1-76a1.patch

@@ -2,7 +2,7 @@
 # User William Lachance <wlachance@mozilla.com>
 # Date 1584544044 0
 # Node ID 255f5213cfd5bac607332aa3c3a0468ddbc8af45
-# Parent  66f45b956cc7c24a64e4c5b96e2b94016d5e070a
+# Parent  09fecff82e878bf9ac58dde557d54bd7ce1c343b
 Bug 1623132 - Rewrite printconfigsetting to use configparser, python 3 r=rstewart
 
 Differential Revision: https://phabricator.services.mozilla.com/D67210
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D67210
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -98,20 +98,20 @@ installers-%:
+@@ -98,13 +98,13 @@ installers-%:
  	@$(MAKE) repackage-zip-$*
  ifeq (WINNT,$(OS_ARCH))
  	@$(MAKE) package-win32-installer AB_CD=$*
@@ -26,13 +26,6 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 -	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
 +	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
  	    '$(STAGEDIST)'/application.ini App BuildID
- 
- # test target, depends on make package
- # try to repack x-test, with just toolkit/defines.inc being there
- l10n-check:: INNER_UNMAKE_PACKAGE=true
- l10n-check::
- 	$(RM) -rf x-test
- 	$(NSINSTALL) -D x-test/toolkit
 diff --git a/config/printconfigsetting.py b/config/printconfigsetting.py
 --- a/config/printconfigsetting.py
 +++ b/config/printconfigsetting.py
@@ -113,7 +106,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
 diff --git a/tools/lint/py2.yml b/tools/lint/py2.yml
 --- a/tools/lint/py2.yml
 +++ b/tools/lint/py2.yml
-@@ -30,16 +30,17 @@ py2:
+@@ -29,16 +29,17 @@ py2:
          - testing/web-platform
          - toolkit
          - tools/power/mach_commands.py

mozilla-release/patches/series

@@ -6210,11 +6210,13 @@ NOBUG-removenonascii67a1-25314.patch
 1619475-2-75a1.patch
 1619788-75a1.patch
 1620449-75a1.patch
-1581684-2-77a1.patch
-1581684-3-77a1.patch
-1619956-76a1.patch
-1620860-76a1.patch
 1620433-76a1.patch
+1602271-76a1.patch
+1601140-1-76a1.patch
+1601140-2-76a1.patch
+1620860-76a1.patch
+1613985-76-PARTIAL-jsoncpponly-76a1.patch
+1619956-76a1.patch
 1620744-01-76a1.patch
 1620744-02-76a1.patch
 1620744-03no04-76a1.patch
@@ -6225,10 +6227,17 @@ NOBUG-removenonascii67a1-25314.patch
 1620744-11-76a1.patch
 1620744-12-76a1.patch
 1620744-13-76a1.patch
+1609823-76a1.patch
+1619555-PARTIAL-76a1.patch
 1620020-01-76a1.patch
 1620020-02-76a1.patch
 1620020-03-76a1.patch
 1620020-04-76a1.patch
+1622021-76a1.patch
+1619460-76a1.patch
+1607193-2-76a1.patch
+1607193-3-76a1.patch
+1621198-76a1.patch
 1620020-05-76a1.patch
 1620020-06-76a1.patch
 1620020-07-76a1.patch
@@ -6240,20 +6249,36 @@ NOBUG-removenonascii67a1-25314.patch
 1620020-13-76a1.patch
 1620020-14-76a1.patch
 1620020-15-76a1.patch
+1622405-1-76a1.patch
+1622405-2-76a1.patch
 1622227-76a1.patch
-1613985-PARTIAL-jsoncpponly-76a1.patch
+1619154-76a1.patch
 1623132-1-76a1.patch
 1623132-2-76a1.patch
+1623339-1-76a1.patch
+1623339-2-76a1.patch
+1623339-3-76a1.patch
+1622789-76a1.patch
 1622356-76a1.patch
+1623656-76a1.patch
 1623433-76a1.patch
-1619555-partial-76a1.patch
 1620471-76a1.patch
+1622974-1-76a1.patch
+1622974-2-76a1.patch
+1623684-76a1.patch
+1616584-76a1.patch
+1621322-2-76a1.patch
+1624190-1-76a1.patch
 1624015-1-76a1.patch
 1624015-2-76a1.patch
 1624015-3-76a1.patch
 1624015-4-76a1.patch
-1626007-76a1.patch
-1626190-76a1.patch
+1623765-76a1.patch
+1624190-2-76a1.patch
+1621439-76a1.patch
+1624670-1-76a1.patch
+1623952-76a1.patch
+1623982-76a1.patch
 1594545-01-76a1.patch
 1594545-02-76a1.patch
 1594545-03-76a1.patch
@@ -6262,47 +6287,22 @@ NOBUG-removenonascii67a1-25314.patch
 1594545-06-76a1.patch
 1594545-07-76a1.patch
 1594545-08-76a1.patch
+1626007-76a1.patch
+1626190-76a1.patch
 1594545-09-76a1.patch
+1626104-76a1.patch
+1626163-76a1.patch
 1594545-10-76a1.patch
 1594545-11-76a1.patch
 1594545-12-76a1.patch
 1594545-13-76a1.patch
-1626640-76a1.patch
-1627439-76a1.patch
-1619154-76a1.patch
-1623952-76a1.patch
-1602271-76a1.patch
-1601140-1-76a1.patch
-1601140-2-76a1.patch
-1622021-76a1.patch
-1622405-1-76a1.patch
-1622405-2-76a1.patch
-1607193-2-76a1.patch
-1607193-3-76a1.patch
-1623656-76a1.patch
-1622974-1-76a1.patch
-1622974-2-76a1.patch
-1621322-2-76a1.patch
-1623339-1-76a1.patch
-1623339-2-76a1.patch
-1623339-3-76a1.patch
-1626104-76a1.patch
-1616584-76a1.patch
-1623765-76a1.patch
-1624190-1-76a1.patch
-1624190-2-76a1.patch
-1619460-76a1.patch
-1623982-76a1.patch
-1621439-76a1.patch
-1622789-76a1.patch
-1626163-76a1.patch
-1621198-76a1.patch
-1623684-76a1.patch
-1624670-1-76a1.patch
-1624670-2-76a1.patch
 1626550-76a1.patch
+1626640-76a1.patch
 1623321-76a1.patch
-1609823-76a1.patch
+1627439-76a1.patch
+1624670-2-77a1.patch
+1581684-2-77a1.patch
+1581684-3-77a1.patch
 1606703-77a1.patch
 1616353-1-77a1.patch
 1627255-1-77a1.patch