Граф коммитов

4584 Коммитов

Автор SHA1 Сообщение Дата
Kit Cambridge d2833635e1 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

--HG--
extra : rebase_source : 10cda7f529cec3f71d9d45d253285d35788cb0b5
2017-04-28 14:08:11 -07:00
tiago 7d0f361ba0 Bug 1356282 - Change Sync's Utils.arraySub to be O(n) using Set. r=tcsc
Sync's Utils.arrayUnion and Utils.arraySub are O(n^2) because Utils.arraySub uses indexOf inside a loop. This patch makes Utils.arraySub use a Set, and by doing so, Utils.arrayUnion and Utils.arraySub become O(n).

MozReview-Commit-ID: DDqjRWalfP9

--HG--
extra : rebase_source : ec90092244e16d3651f0d69ea8db1944301c13fb
2017-05-05 03:16:30 -03:00
Mark Banner 0ce286101c Bug 1359011 - Make the mozilla/recommended eslint configuration the default for the whole tree. r=mossop
MozReview-Commit-ID: HtUW43tCli1

--HG--
extra : rebase_source : 6496bc47860d9c1ab522a78e73b41550700021cb
2017-04-25 20:12:21 +01:00
Mathieu Leplatre 4fc3418733 Bug 1357116 - Load the blocklist updater module lazily r=florian,mgoodwin
Importing the blocklist-updater module on each notification in nsBlocklistService
could cause us to periodically jank the browser UI.

This patch now lazy loads as many dependencies as possible.


MozReview-Commit-ID: HBGjSJi5PwE

--HG--
extra : rebase_source : 4a7c18fe64b810f54d52eee07883d67837b297d3
2017-04-20 10:35:04 +02:00
Wes Kocher 274ba1a154 Merge inbound to central, a=merge
MozReview-Commit-ID: AFMOzsYBEjc
2017-05-15 16:22:21 -07:00
jomer14 fab6e7f663 Bug 1362510 - Remove errors.properties and references. r=eoger
MozReview-Commit-ID: 27kIRQdEHsE
2017-05-15 12:03:55 -04:00
tiago 45fdbb5730 Bug 1355663 - Don't de-duplicate tabs from multiple devices. r=eoger
MozReview-Commit-ID: AciCTECtXJc

--HG--
extra : rebase_source : 82f81f227cf27cf03c4672f0402641010434e74e
2017-05-12 20:54:54 -03:00
Edouard Oger 3d2e65ee7e Bug 1364571 - Delay Weave startup. r=kitcambridge
MozReview-Commit-ID: 4bm1LXLD7lV

--HG--
extra : rebase_source : c1b14b70e4d952870800387f16c7fecab9667b49
2017-05-12 17:01:25 -04:00
Honza Bambas d6d727a69e backout of f9abb9c83452 (bug 1319111) for crashes, r=bz 2017-05-13 13:55:11 +02:00
Wes Kocher 0a1e1fe23b Backed out changeset 95ff98f1c2e5 (bug 1319111) for talos failures a=backout
MozReview-Commit-ID: Gs09moFm5rQ
2017-05-12 18:24:42 -07:00
Honza Bambas 70f62bdec1 backout of f9abb9c83452 (bug 1319111) for crashes, r=bz 2017-05-12 22:13:49 +02:00
Florian Quèze 4e937e42a2 Bug 1353542 - Cleanup the script output and fix tests, r=Mossop. 2017-05-12 14:54:05 +02:00
Thom Chiovoloni 65e959c068 Bug 1357814 - Changes to sync's TPS tests to allow running from automation r=markh
1. Ensure we wait for browser-delayed-startup-finished
2. Parse the profile we're cleaning up from the cleanup phase name instead of
   using the selectedProfile.
3. Ensure that bookmark repair doesn't run randomly (this isn't necessary, but
   the repair code can make the actual reason for failure much more difficult to
   debug, and could probably cause a test to pass when it should not).
4. Add multiprocessCompatible flags so that TPS can still start in nightly (and
   because it is).

MozReview-Commit-ID: 98UvRoFOdzv

--HG--
extra : rebase_source : ff1f199eafdcc569cfdf9cb373ee4d059b37ec35
2017-05-05 14:54:03 -04:00
Kit Cambridge 103b72ff2f Bug 1335891 - Ensure and test that Sync changes don't bump the score. r=markh
MozReview-Commit-ID: 4dP5oZS3pm

--HG--
extra : rebase_source : ebada671d4aa5feba290f118e370fd7def093c4a
2017-05-09 13:04:50 -07:00
Kit Cambridge 2401fa0477 Bug 1335891 - Trigger another sync if tracked items have changed during the last sync. r=markh
MozReview-Commit-ID: 7EcIX7QrsN4

--HG--
extra : rebase_source : 41f0886f5e40b9b8aaaebc5ebaa40a247bba13ef
2017-05-10 19:21:16 -07:00
Ethan Glasser-Camp 3abedf0d48 Bug 1363430: Update kinto-http.js to 4.3.4, r=MattN
MozReview-Commit-ID: BenayrfXlKC

--HG--
extra : rebase_source : d8b09f46532eba84adbca253f47f434b3fff918e
2017-05-09 12:27:11 -04:00
Thom Chiovoloni 0c6fcd0d50 Bug 1362099 - Make RESTRequest handle GET's where the response is > 8192 bytes and we know the charset r=markh
MozReview-Commit-ID: 6g8hCvr7ZbJ

--HG--
extra : rebase_source : 740e44f4cf6be265e2c04a78d4737a118f0a1b3f
2017-05-05 16:29:01 -04:00
Frederik Braun cd1cbcef0f Bug 1359350: Add no-eval rule to eslint config (and whitelist failures in tests) r=standard8
MozReview-Commit-ID: 4nYlX4sSdbF

--HG--
extra : rebase_source : cf610e7d8bf2b8dbd5a0d40c5b835bc6620c3bba
2017-05-08 14:50:50 +02:00
Kit Cambridge 5fc76a861d Bug 1361171 - Remove CloudSync. r=markh
MozReview-Commit-ID: CjBsEZa6oIP

--HG--
extra : rebase_source : 965db37197242acf63e77dbcca74a2984532b4ff
2017-05-01 14:43:00 -07:00
Carsten "Tomcat" Book fdc689ba16 merge mozilla-inbound to mozilla-central a=merge 2017-05-05 15:17:26 +02:00
Honza Bambas a1b64b4694 Bug 1319111 - Expose URI to make security check against on LoadInfo (no LOAD_REPLACE flag). r=bz 2017-01-27 19:10:01 +01:00
Edouard Oger b3b3ff9cc5 Bug 1353571 part 3 - Refactor browser-syncui and browser-fxaccounts. r=markh
MozReview-Commit-ID: K790Ag8WZgv

--HG--
rename : browser/base/content/test/general/accounts_testRemoteCommands.html => browser/base/content/test/sync/accounts_testRemoteCommands.html
rename : browser/base/content/test/general/browser_fxa_web_channel.html => browser/base/content/test/sync/browser_fxa_web_channel.html
rename : browser/base/content/test/general/content_aboutAccounts.js => browser/base/content/test/sync/content_aboutAccounts.js
extra : rebase_source : dcba087df94d06b15c9f073ff2df3324fd646c57
2017-04-18 14:15:43 -04:00
Edouard Oger 1df337c9ce Bug 1361572 - Remove Task.jsm/Promise.jsm from services/. r=kitcambridge
MozReview-Commit-ID: BBIkpIkWIYc

--HG--
extra : rebase_source : a0f10b07bad20789e2d1c2c2bca133b32bf671aa
2017-05-02 19:29:33 -04:00
Sebastian Hengst 18253e3fa2 Backed out changeset 0a0138825fb5 (bug 1353571)
--HG--
rename : browser/base/content/test/sync/accounts_testRemoteCommands.html => browser/base/content/test/general/accounts_testRemoteCommands.html
rename : browser/base/content/test/sync/browser_fxa_web_channel.html => browser/base/content/test/general/browser_fxa_web_channel.html
rename : browser/base/content/test/sync/content_aboutAccounts.js => browser/base/content/test/general/content_aboutAccounts.js
2017-05-03 21:56:44 +02:00
Edouard Oger c11e66021d Bug 1353571 part 3 - Refactor browser-syncui and browser-fxaccounts. r=markh
MozReview-Commit-ID: K790Ag8WZgv

--HG--
rename : browser/base/content/test/general/accounts_testRemoteCommands.html => browser/base/content/test/sync/accounts_testRemoteCommands.html
rename : browser/base/content/test/general/browser_fxa_web_channel.html => browser/base/content/test/sync/browser_fxa_web_channel.html
rename : browser/base/content/test/general/content_aboutAccounts.js => browser/base/content/test/sync/content_aboutAccounts.js
extra : rebase_source : aa6cb209d312c6ef3f45589b0fd8fa8a39c612e3
2017-04-18 14:15:43 -04:00
Edouard Oger b80261a3ec Bug 1358648 part 3 - Remove Async, Services and XPCOMUtils from util.js. r=markh
MozReview-Commit-ID: 8na204K9cXp

--HG--
extra : rebase_source : 96e7738aa6612cf67543d50053f50c2bccf1ab7e
2017-05-02 16:57:37 -04:00
Edouard Oger abba8c5b31 Bug 1358648 part 2 - Remove util.js Svc.{DefaultPrefs,Session,Idle, FormHistory} and Str. r=markh
MozReview-Commit-ID: Jc1th8Snvhv

--HG--
extra : rebase_source : dd950a5d7bb0f2cb2ea4f32c7b61eb2a15ae327d
2017-05-02 18:30:23 -04:00
Edouard Oger 712abbc07a Bug 1358648 part 1 - Clean-up some Weave imports. r=markh
MozReview-Commit-ID: 2NK4Mew65UT

--HG--
extra : rebase_source : f515a4c26f2ac515c67d37f4cf01f79427b38221
2017-05-02 18:27:49 -04:00
Sebastian Hengst 43a868766b Backed out changeset 83fe6517d5be (bug 1357116) for eslint failures in blocklist-clients.js. r=backout 2017-05-02 19:59:32 +02:00
Mathieu Leplatre ec15502b47 Bug 1357116 - Load the blocklist updater module lazily r=florian,mgoodwin
MozReview-Commit-ID: IjdpY9JZQPL

--HG--
extra : rebase_source : 1c2968fff0c0a11f0adf68f0bc9b0905ed4ac457
2017-04-27 14:45:57 +02:00
Dan Banner f2a6a685fe Bug 1359540 - Enable the Mozilla ESlint recommended rules for services/. r=markh
MozReview-Commit-ID: D6qH5XtEtHO

--HG--
extra : rebase_source : 8e4c319c7fb8b727ac0193e5dd78411e1ec2785c
2017-04-27 17:24:18 +01:00
Mathieu Leplatre 250807ae85 Bug 1347728 - Fix JSON dump of blocklists r=kjozwiak,mgoodwin
MozReview-Commit-ID: rwX5Nn9d6b

--HG--
extra : rebase_source : ad24a54d4be06028d1af93cfdb31beb3e4124b1b
2017-03-22 15:46:55 +01:00
Carsten "Tomcat" Book 8cb9279791 Backed out changeset e6177d883f37 (bug 1359540) for eslint failures 2017-05-02 09:25:45 +02:00
Dan Banner 0c2aa823c9 Bug 1359540 - Enable the Mozilla ESlint recommended rules for services/. r=markh
MozReview-Commit-ID: D6qH5XtEtHO

--HG--
extra : rebase_source : 3d8d878810c60dc339e196eaac0215f9f72cc829
2017-04-27 17:24:18 +01:00
Kit Cambridge dcce7ae769 Bug 1348699 - Add test to ensure we don't track left pane queries. r=mak,markh
MozReview-Commit-ID: LFoCpvz2rAn

--HG--
extra : rebase_source : c2e927100899b5856d0fc2350efdf0e1ffb52e77
2017-03-20 19:22:15 -07:00
Kit Cambridge 5b32e800fa Bug 1350030 - Extract `serverForEngine` into `serverForEnginesWithKeys`. r=tcsc
MozReview-Commit-ID: 3D1xwv9k76m

--HG--
extra : rebase_source : a27836cea6100fd90e15ed95b08c9f02e6c79605
2017-03-30 18:01:19 -07:00
Thom Chiovoloni 20f27ffe75 Bug 1361818 - Make sure TPS is aware sync's collection.get method is asynchronous now r=markh
Ideally we'd convert this to promises, but this function is already full of
promiseSpinningly's and removing them all is too much work for this bug.

MozReview-Commit-ID: 144JFRwejTb

--HG--
extra : rebase_source : 40371c6cfeee9fddffe4b737cbb98fecb424b719
2017-05-03 15:12:30 -04:00
Alexandre Poirot c90bccb53a Bug 1356231 - Use toolkit EventEmitter.jsm instead of devtools module. r=mossop
MozReview-Commit-ID: 49JI7NtLwKK

--HG--
extra : rebase_source : 7fb015f56be94c4bbe2d56506653f069c9ad8dd3
2017-04-27 17:58:09 +02:00
Florian Queze 4b1556a5f2 Bug 1355056 - replace (function(args) { /* do stuff using this */ }).bind(this) with arrow functions, r=jaws. 2017-04-27 00:25:45 +02:00
Mark Banner 29c680ad80 Bug 1359140 - Fix various ESLint issues in services/ (mostly automatic). r=markh
This fixes various errors raised in services for the rules: key-spacing, quotes, no-else-return, no-extra-semi, comma-spacing, object-shorthand.

MozReview-Commit-ID: IClwG5rfXfW

--HG--
extra : rebase_source : 81c059dacfc39b5cf8bc85b9b746dcdd494a3629
2017-04-24 18:52:57 +01:00
Edouard Oger 1b936ebd82 Bug 1356112 - Set identity.fxaccounts.settings.devices.uri when using the FxA well-known configuration. r=tcsc
MozReview-Commit-ID: IJaMuIorXHg

--HG--
extra : rebase_source : 9dc1e723632c1821af5299e6f91c54471c4855f6
2017-04-20 13:57:23 -04:00
Mark Hammond 00431016d0 Bug 1355677 - Make all Sync network requests promise based. r=kitcambridge,rnewman,tcsc
MozReview-Commit-ID: JSwAS4Xd1uy

--HG--
extra : rebase_source : 95724c3b59576d40cafd2f380ff42acb4fc3d553
2017-04-11 23:40:53 +10:00
Sebastian Hengst ceb65c045e Backed out changeset 816a2cc1254a (bug 1347728) for failing xpcshell's test_blocklist_certificates.js on Windows r=backout 2017-04-20 19:11:04 +02:00
Mathieu Leplatre 04cf765d30 Bug 1347728 - Fix JSON dump of blocklists r=kjozwiak,mgoodwin
MozReview-Commit-ID: rwX5Nn9d6b

--HG--
extra : rebase_source : 5df03011e57211e6cf2d67f1bda3f71d188c7f91
2017-03-22 15:46:55 +01:00
Thom Chiovoloni 8b9281c90a Bug 1350135 - Fix failing TPS test_history_collision.js test r=markh
There were three issues here: The first is that the TPS's history module didn't
wait for PlacesUtils.history.remove's promise to resolve.

The second is that the SYNC_WIPE_REMOTE in the previous client would cause a
write to the clients collection, which would cause the next client to get a
"sync:collection_changed" push. This caused a sync of *only* the clients
collection upon reciept, which would prevent TPS from explicitly syncing all
engines.

The third is that TPS wasn't correctly handling the cases where logIn would
trigger a sync, which would cause a failure during the first sync of a session.
This would cause failures on other TPS tests as well.

MozReview-Commit-ID: LpqZ7Kt9fyy

--HG--
extra : rebase_source : f1d3c40e2ef4e09cce4d2ce8ae25f2c86ddfee45
2017-04-19 14:38:00 -04:00
Thom Chiovoloni 0bb64306d4 Bug 1346175 - Record AsyncResource.serverTime in sync telemetry events. r=bsmedberg,markh
MozReview-Commit-ID: DG43B9zEHaO

--HG--
extra : rebase_source : 9b16fe1dff50574036fb2e10224d8056fe415ecd
2017-04-04 13:51:16 -04:00
Marco Bonardo 12dcd10d01 Bug 1356567 - root icons should still create a page association if the domain differs. r=adw,kitcambridge
Root domain icons are no more associated with their pages, BUT if the page uses
a root domain icon from another domain, it should still get an association with it
or we couldn't relate the two.

This also fixes an overlooked problem in PlacesTestUtils where Date objects
cross a boundary and fail instanceof checks. This causes failures in the same
test that this patch is modifying.
To protect from future similar issues some protection has been added to updatedPlaces
so that it will crash in debug builds.

MozReview-Commit-ID: 3MTKhGj3ehj

--HG--
extra : rebase_source : 55120252e7ea8abb91f21ca2486deddc43795142
2017-04-14 20:34:27 +02:00
Carsten "Tomcat" Book 16969b40e2 Backed out changeset eb94759f0fcf (bug 1356567) for test failures in own test 2017-04-18 12:58:09 +02:00
Marco Bonardo 5238755b71 Bug 1356567 - root icons should still create a page association if the domain differs. r=adw,kitcambridge
Root domain icons are no more associated with their pages, BUT if the page uses
a root domain icon from another domain, it should still get an association with it
or we couldn't relate the two.

This also fixes an overlooked problem in PlacesTestUtils where Date objects
cross a boundary and fail instanceof checks. This causes failures in the same
test that this patch is modifying.
To protect from future similar issues some protection has been added to updatedPlaces
so that it will crash in debug builds.

MozReview-Commit-ID: 3MTKhGj3ehj

--HG--
extra : rebase_source : e36ba1ab41649927f92fee053c10bf43474a0bcf
2017-04-14 20:34:27 +02:00
tiago c05723ef0c Bug 986501 - Avoid unnecessary compartments on Sync startup r=markh
MozReview-Commit-ID: 8Rr3JD4dfVy

--HG--
extra : rebase_source : b18f24229bbd1caf80d9f175a79c1fdb0aeccd0d
2017-04-13 20:36:08 -03:00