Chronological shuffle for 75a1

mozilla-release/patches/1613263-75a1.patch

@@ -2,7 +2,7 @@
 # User Ricky Stewart <rstewart@mozilla.com>
 # Date 1582149050 0
 # Node ID 061442a5cbbf18e264ee4fef6739b0c302545915
-# Parent  32a6e6a057ca67ca181be700168879eb8c535f7c
+# Parent  9e5a622ad2d4a21d43663c1fff4e7c20ee8bbf68
 Bug 1613263 - Use io.open() rather than open() in mozbuild/preprocessor.py r=firefox-build-system-reviewers,mshal
 
 Differential Revision: https://phabricator.services.mozilla.com/D61647
@@ -353,14 +353,14 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
 +import sys
 +
  from mozbuild.makeutil import Makefile
- from mozpack.path import normsep
  
  # hack around win32 mangling our line endings
  # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65443
  if sys.platform == "win32":
      import msvcrt
      msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-@@ -488,17 +490,17 @@ class Preprocessor:
+     os.linesep = '\n'
+@@ -487,17 +489,17 @@ class Preprocessor:
          def get_output_file(path):
              dir = os.path.dirname(path)
              if dir:
@@ -379,7 +379,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
  
          if options.output:
              out = get_output_file(options.output)
-@@ -510,17 +512,17 @@ class Preprocessor:
+@@ -509,17 +511,17 @@ class Preprocessor:
          if options.depend:
              if not options.output:
                  raise Preprocessor.Error(self, "--depend doesn't work with stdout",
@@ -398,7 +398,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
                  ).add_dependencies(self.includes)
                  mk.dump(depfile)
                  depfile.close()
-@@ -800,17 +802,17 @@ class Preprocessor:
+@@ -799,17 +801,17 @@ class Preprocessor:
          self.checkLineNumbers = False
          if isName:
              try:
@@ -417,7 +417,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
          oldFile = self.context['FILE']
          oldLine = self.context['LINE']
          oldDir = self.context['DIRECTORY']
-@@ -855,17 +857,17 @@ class Preprocessor:
+@@ -854,17 +856,17 @@ class Preprocessor:
  
  
  def preprocess(includes=[sys.stdin], defines={},
@@ -439,14 +439,14 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
 diff --git a/python/mozbuild/mozbuild/test/backend/test_build.py b/python/mozbuild/mozbuild/test/backend/test_build.py
 --- a/python/mozbuild/mozbuild/test/backend/test_build.py
 +++ b/python/mozbuild/mozbuild/test/backend/test_build.py
-@@ -145,21 +145,18 @@ class TestBuild(unittest.TestCase):
+@@ -146,21 +146,18 @@ class TestBuild(unittest.TestCase):
  
              self.validate(config)
  
      def validate(self, config):
          self.maxDiff = None
-         test_path = mozpath.join('$SRCDIR', 'python', 'mozbuild', 'mozbuild',
-                                  'test', 'backend', 'data', 'build')
+         test_path = os.sep.join(('$SRCDIR', 'python', 'mozbuild', 'mozbuild',
+                                  'test', 'backend', 'data', 'build')) + os.sep
  
 -        # We want unicode instances out of the files, because having plain str
 -        # makes assertEqual diff output in case of error extra verbose because

mozilla-release/patches/1618775-75a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1582893109 0
 # Node ID 863de9919ba03163f29312b6a4867dd4c6ba9872
-# Parent  f0274c5a7877afff2670d17e16a9af096a3f3126
+# Parent  ac1a194c3d6da60e24f792c205e26766b567e20b
 Bug 1618775 - Uniformize preprocessor-inserted paths between platforms. r=froydnj
 
 The preprocessor adds line markers in preprocessed files with line
@@ -20,14 +20,14 @@ Differential Revision: https://phabricator.services.mozilla.com/D64714
 diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
 --- a/python/mozbuild/mozbuild/preprocessor.py
 +++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -26,16 +26,17 @@ from __future__ import absolute_import, 
- 
- import sys
+@@ -28,16 +28,17 @@ import errno
+ import io
+ from optparse import OptionParser
  import os
  import re
  import six
- from optparse import OptionParser
- import errno
+ import sys
+ 
  from mozbuild.makeutil import Makefile
 +from mozpack.path import normsep
  
@@ -38,7 +38,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
      msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
      os.linesep = '\n'
  
-@@ -821,19 +822,19 @@ class Preprocessor:
+@@ -823,19 +824,19 @@ class Preprocessor:
              self.context['FILE'] = '-'
              self.context['DIRECTORY'] = ''
              self.curdir = '.'
@@ -77,14 +77,14 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_build.py b/python/mozbui
 +        test_path = mozpath.join('$SRCDIR', 'python', 'mozbuild', 'mozbuild',
 +                                 'test', 'backend', 'data', 'build')
  
-         # We want unicode instances out of the files, because having plain str
-         # makes assertEqual diff output in case of error extra verbose because
-         # of the difference in type.
          result = {
-             p: f.open().read().decode('utf-8')
+             p: f.open(mode='r').read()
              for p, f in FileFinder(mozpath.join(config.topobjdir, 'dist'))
          }
-@@ -169,34 +169,34 @@ class TestBuild(unittest.TestCase):
+         self.assertTrue(len(result))
+         self.assertEqual(result, {
+             'bin/baz.ini': 'baz.ini: FOO is foo\n',
+@@ -166,34 +166,34 @@ class TestBuild(unittest.TestCase):
                  'manifest components/components.manifest\n',
              'bin/chrome/foo.manifest':
                  'content bar foo/child/\n'
@@ -124,7 +124,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_build.py b/python/mozbui
              'bin/app/baz.ini': 'baz.ini: FOO is bar\n',
              'bin/app/child/bar.ini': 'bar.ini\n',
              'bin/app/child2/qux.ini': 'qux.ini: BAR is defined\n',
-@@ -205,34 +205,34 @@ class TestBuild(unittest.TestCase):
+@@ -202,34 +202,34 @@ class TestBuild(unittest.TestCase):
                  'manifest components/components.manifest\n',
              'bin/app/chrome/foo.manifest':
                  'content bar foo/child/\n'