f6bd9857f97dc3162b86e01600d755e62f4b63ab: Bug 1352233 - Try to preserve synced folder child order in case of conflicts. r=tcsc
Kit Cambridge <kit@yakshaving.ninja> - Fri, 28 Apr 2017 14:08:11 -0700 - rev 360046
Push 43187 by kcambridge@mozilla.com at Tue, 23 May 2017 00:25:38 +0000
Bug 1352233 - Try to preserve synced folder child order in case of conflicts. r=tcsc For folders, we resolve conflicts by taking the chronologically newer list, then appending any missing items from the older list. This preserves the order of those missing items relative to each other, but not relative to those appearing in the newer list. MozReview-Commit-ID: 6rimXpV7vLg
a0e257e346ccf3c1db332ec5903241f4eeb9a7ee: Bug 1359965 - Support and generate tar.gz WPT archive; r=glandium
Gregory Szorc <gps@mozilla.com> - Mon, 08 May 2017 17:19:05 -0700 - rev 360045
Push 43186 by gszorc@mozilla.com at Tue, 23 May 2017 00:22:52 +0000
Bug 1359965 - Support and generate tar.gz WPT archive; r=glandium Several years ago there was a single zip file for all test files. Clients would only extract the files they needed. Thus, zip was a reasonable archive format because it allowed direct access to members without having to decompress the entirety of the stream. We have since split up that monolithic archive into separate, domain-specific archives. e.g. 1 archive for mochitests and one for xpcshell tests. This drastically cut down on network I/O required on testers because they only fetched archives/data that was relevant. It also enabled parallel generation of test archives, we shaved dozens of seconds off builds due to compression being a long pole. Despite the architectural changes to test archive management, we still used zip files. This is not ideal because we no longer access specific files in test archives and thus don't care about single/partial member access performance. This commit implements support for generating tar.gz test archives. And it switches the web-platform archive to a tar.gz file. The performance implications for archive generation are significant: before: 48,321,250 bytes; 6.05s after: 31,844,267 bytes; 4.57s The size is reduced because we have a single compression context so data from 1 file can benefit compression in a subsequent file. CPU usage is reduced because the compressor has to work less with 1 context than it does with N. While I didn't measure it, decompression performance should also be improved for the same reasons. And of course network I/O will be reduced. mozharness consumers use a generic method for handling unarchiving. This method automagically handles multiple file extensions. So as long as downstream consumers aren't hard coding ".zip" this change should "just work." MozReview-Commit-ID: LQa5MIHLsms
ae8bce278626bc84914063f93292ac5e825eec36: Bug 1359965 - Support mozpack.file.BaseFile in create_tar_from_files; r=glandium
Gregory Szorc <gps@mozilla.com> - Mon, 08 May 2017 17:00:20 -0700 - rev 360044
Push 43186 by gszorc@mozilla.com at Tue, 23 May 2017 00:22:52 +0000
Bug 1359965 - Support mozpack.file.BaseFile in create_tar_from_files; r=glandium This allows us to write files coming from a finder or other source that isn't directly the filesystem. MozReview-Commit-ID: KhPSD0JYzsQ
965639b40b6a433803cf9ad4532286e7647d501a: Bug 1361172 - Rewrite code for finding files in VCS checkout; r=glandium
Gregory Szorc <gps@mozilla.com> - Thu, 18 May 2017 16:06:49 -0700 - rev 360043
Push 43185 by gszorc@mozilla.com at Mon, 22 May 2017 23:57:32 +0000
Bug 1361172 - Rewrite code for finding files in VCS checkout; r=glandium We're getting an intermittent failure running `hg manifest` in CI. I have no clue why. What I do know is that we now have the mozversioncontrol Python package for containing utility code for interacting with version control. It is slightly more robust and I'm willing to support it more than I am check_utils.py. This commit adds a new API to our abstract repository class to obtain the files in the working directory by querying version control. Since I suspect cwd was coming into play in automation, I've also added a utility function to mozversioncontrol to attempt to find a version control checkout from the current working directory. It simply traces ancestor paths looking for a .hg or .git directory. Finally, I've ported all callers of the now-deleted API to the new one. The old code had some "../.." paths in it, meaning it only worked when cwd was just right. Since we resolve the absolute path to the checkout and store it on the repo object, I've updated the code so it should work no matter what cwd is as long as a repo can be found. I'm not 100% confident I found all consumers assuming cwd. But it's a start. I'm not 100% confident this will fix the intermittent issues in CI. But at least we should get a better error message and at least we'll be running less hacky code. MozReview-Commit-ID: AmCraHXcTEX
8740b130efef4571b554aa588de13857a3915257: Merge m-c to autoland, a=merge
Wes Kocher <wkocher@mozilla.com> - Mon, 22 May 2017 16:38:46 -0700 - rev 360042
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Merge m-c to autoland, a=merge MozReview-Commit-ID: AVwPRGa5re9
5bc1c758ab57c1885dceab4e7837e58af27b998c: Merge inbound to central, a=merge
Wes Kocher <wkocher@mozilla.com> - Mon, 22 May 2017 16:26:12 -0700 - rev 360041
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Merge inbound to central, a=merge MozReview-Commit-ID: 7NiWtCjPk84
d712c82c59ec5a277047a75d09bec48be4a64b87: Backed out changeset 3b98429334b7 (bug 1365878) for android lint failures a=bustage
Wes Kocher <wkocher@mozilla.com> - Mon, 22 May 2017 16:19:44 -0700 - rev 360040
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 3b98429334b7 (bug 1365878) for android lint failures a=bustage MozReview-Commit-ID: FTvYeHMZORS
4cf4e0f20ceefc5048ff0756bf26f09d7a0207ca: Backed out changeset 4f0f6745c23d (bug 1158387) for failing extensions/cookie/test/unit/test_cookies_async_failure.js on Windows 7 VM opt. r=backout
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 22:03:32 +0200 - rev 360039
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 4f0f6745c23d (bug 1158387) for failing extensions/cookie/test/unit/test_cookies_async_failure.js on Windows 7 VM opt. r=backout MozReview-Commit-ID: JASYcL9x3kV
9064201fe65582e5a150c4cdf807223225a81e56: Backed out 2 changesets (bug 1342289) for crashtest leaks a=backout
Wes Kocher <wkocher@mozilla.com> - Mon, 22 May 2017 12:50:23 -0700 - rev 360038
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out 2 changesets (bug 1342289) for crashtest leaks a=backout Backed out changeset 3744676f7923 (bug 1342289) Backed out changeset d0a029765f69 (bug 1342289) MozReview-Commit-ID: Fb6GfKo6AhJ
ec6edd4fec8f62db57c1f075d1d3b536c74af5f8: Bug 1358073 - Handle destruction of scope data correctly r=shu a=abillings
Jon Coppeard <jcoppeard@mozilla.com> - Mon, 22 May 2017 14:01:19 -0400 - rev 360037
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Bug 1358073 - Handle destruction of scope data correctly r=shu a=abillings
75cd3397298ad5c0f02129a87f465059018a9f63: Bug 1365928 - patch 2 - Annotate style-struct getters with MOZ_NONNULL_RETURN for better optimization. r=mats
Jonathan Kew <jkew@mozilla.com> - Mon, 22 May 2017 19:00:19 +0100 - rev 360036
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Bug 1365928 - patch 2 - Annotate style-struct getters with MOZ_NONNULL_RETURN for better optimization. r=mats
3d3190803408c7605fbb52f8215a757fffedcad5: Bug 1365928 - patch 1 - Add a MOZ_NONNULL_RETURN annotation to mfbt/Attributes.h. r=froydnj
Jonathan Kew <jkew@mozilla.com> - Mon, 22 May 2017 19:00:19 +0100 - rev 360035
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Bug 1365928 - patch 1 - Add a MOZ_NONNULL_RETURN annotation to mfbt/Attributes.h. r=froydnj
fd30cdc0b8c848a1d94bf79822df138363b0f6d2: Backed out changeset 357a1c414efa (bug 1365650) for rooting hazard. r=backout
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 19:53:57 +0200 - rev 360034
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 357a1c414efa (bug 1365650) for rooting hazard. r=backout
3a976d8e893b611f7b010ecc2afb9e40820531c6: Backed out changeset 415c55bb940c (bug 1366484) for likely letting browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js frequently fail on Windows 7 VM. r=backout
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 19:50:52 +0200 - rev 360033
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 415c55bb940c (bug 1366484) for likely letting browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js frequently fail on Windows 7 VM. r=backout
0582b98fa67d2269b2eaf320b98998f6d7a85e99: merge mozilla-central to mozilla-inbound. r=merge a=backout on a CLOSED TREE
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 19:31:13 +0200 - rev 360032
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
merge mozilla-central to mozilla-inbound. r=merge a=backout on a CLOSED TREE
c36497319158aaaf1ba7e28754e9b59b9cf3c441: Backed out changeset 78e8b1f01c25 (bug 1361661) for flake8 linting failures in gen-process-{data,enum}.py and build bustage in TelemetryProcessData.h on OS X, at least. r=backout on a CLOSED TREE
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 16:20:56 +0200 - rev 360031
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 78e8b1f01c25 (bug 1361661) for flake8 linting failures in gen-process-{data,enum}.py and build bustage in TelemetryProcessData.h on OS X, at least. r=backout on a CLOSED TREE
69c42b4e88777789280c95502980f3748ce327d5: Backed out changeset 9cf5185e6d6f (bug 1361661)
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 16:19:26 +0200 - rev 360030
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 9cf5185e6d6f (bug 1361661)
43bd203d571f2f5943660b67c7fa96648596a53f: Backed out changeset d1932fb366d4 (bug 1361661)
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 16:19:21 +0200 - rev 360029
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset d1932fb366d4 (bug 1361661)
8d02af0fa5b1a3f1a1c90155c63bee67f0e8c145: Backed out changeset b0271d3616db (bug 1361661)
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 16:19:16 +0200 - rev 360028
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset b0271d3616db (bug 1361661)
01a7f9ae83785a91f11b6aa0f7ffd5f5c8246c11: Backed out changeset 81b05dd29eb3 (bug 1361661)
Sebastian Hengst <archaeopteryx@coole-files.de> - Mon, 22 May 2017 16:19:11 +0200 - rev 360027
Push 43184 by kwierso@gmail.com at Mon, 22 May 2017 23:38:56 +0000
Backed out changeset 81b05dd29eb3 (bug 1361661)
(0) -300000 -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 tip