Commit Graph

4752 Commits

Author SHA1 Message Date
Mathieu Leplatre
35cef461b5 Bug 1376618 - Load initial blocklist data as synced r=mgoodwin
MozReview-Commit-ID: FZ5XDv4FCEo

--HG--
extra : rebase_source : 441d128585e4eef19dc36a345ff8c62000c0fd4b
2017-06-29 15:44:00 -07:00
Sebastian Hengst
acb0601c26 Backed out changeset d7e7ced3622f (bug 1360872) for failing xpcshell's test_async_transactions.js | test_creating_and_removing_a_separator, at least on OS X. r=backout 2017-06-30 19:29:17 +02:00
Kit Cambridge
c1537b7958 Bug 1360872 - Return empty strings for null bookmark titles. r=mak
MozReview-Commit-ID: Dd2sEfYvnBt

--HG--
extra : rebase_source : 8b09ca049f0891cfc3a909f7b7d2807511586b48
2017-06-06 14:37:22 -07:00
Sebastian Hengst
2cfb02f19d Backed out changeset c0fd6c0590be (bug 1360872) for unused parentId at toolkit/components/places/Bookmarks.jsm:461. r=backout 2017-06-30 00:16:35 +02:00
Kit Cambridge
e80441db92 Bug 1360872 - Return empty strings for null bookmark titles. r=mak
MozReview-Commit-ID: Dd2sEfYvnBt

--HG--
extra : rebase_source : bea2d2589b2a09ba70a5c8e2b50ceee21acf3f0b
2017-06-06 14:37:22 -07:00
Mark Banner
ca6826260e Bug 1119282 - Fix the sync bookmark validator cycle detection to correctly get folder contents. r=kitcambridge
MozReview-Commit-ID: BjRD5wKbAoy

--HG--
extra : rebase_source : 9eb28f31351d4e5256e4aa6e3a87af6a9c934568
2017-06-29 10:49:10 -07:00
Carsten "Tomcat" Book
5f00ae3a8b merge mozilla-inbound to mozilla-central a=merge 2017-06-29 15:47:04 +02:00
Benjamin Smedberg
53c93f8449 Bug 1367813 - 1) Add telemetry for prefs.js not existing or being corrupted, and the presence of a user.js file. 2) Rename and change the nsIPrefService.readUserPrefs API. The new API reads user prefs from a file but doesn't remember that location or save changed preferences to that location. r=milan data-r=rweiss
MozReview-Commit-ID: FD5npJlB24W

--HG--
extra : rebase_source : d30bac5044ecb8d86253e8bca3e8d47371fb9d1f
extra : source : 4f0ee0f75a307095e4a04afe4413e5bb6ea8e502
2017-06-21 15:26:10 -04:00
Edouard Oger
58f16ee440 Bug 1374501 - Allow extra sync engines to be activited using FxA Web Channels. r=markh,stomlinson
MozReview-Commit-ID: HykDad81Ifh

--HG--
extra : rebase_source : d07f048b5f96e7fa9b1fc7130b4f518ac5527075
2017-06-21 13:55:05 -04:00
Bill McCloskey
f115503a0b Bug 1372405 - Provide names for all runnables in the tree (r=froydnj)
MozReview-Commit-ID: DKR6ROiHRS7
2017-06-26 14:19:58 -07:00
Mark Hammond
7e61aa8e97 Bug 1373093 - Add operating system information to the desktop Sync ping. r=tcsc
MozReview-Commit-ID: 9ypnosSawxu

--HG--
extra : rebase_source : 8a0192c70917c952431693c6864f96f7fd9b278e
2017-06-21 12:28:25 +10:00
Jeongkyu Kim
728bae404f Bug 1348727 - Write validation summary information to the sync logs r=tcsc
MozReview-Commit-ID: GRf0DeDhFqP

--HG--
extra : rebase_source : de2b49d55f4cbb4926475851deae298a16423ec9
2017-06-24 02:08:43 +09:00
Phil Ringnalda
c636da88e0 Backed out changeset 4f0ee0f75a30 (bug 1367813) for Windows opt permaorange in test_worker_basic.html
MozReview-Commit-ID: 2k693yFa28r
2017-06-22 20:43:11 -07:00
Benjamin Smedberg
5cf8c34a94 Bug 1367813 - 1) Add telemetry for prefs.js not existing or being corrupted, and the presence of a user.js file. 2) Rename and change the nsIPrefService.readUserPrefs API. The new API reads user prefs from a file but doesn't remember that location or save changed preferences to that location. r=milan data-r=rweiss
MozReview-Commit-ID: FD5npJlB24W

--HG--
extra : rebase_source : 049275836880f0aa4d19a9af2de9ec4101432b44
2017-06-21 15:26:10 -04:00
Florian Quèze
1e40201f6d Bug 1374282 - script generated patch to remove useless bind calls, r=Mossop. 2017-06-22 12:51:42 +02:00
Florian Quèze
66f6d259bc Bug 1374282 - script generated patch to remove Task.jsm calls, r=Mossop. 2017-06-22 12:51:42 +02:00
Andrew McCreight
3e60ae3dd8 Bug 1375133 - Remove unnecessary imports of btoa and atob in services/ code. r=markh
There are a few places in services/ tests that import btoa and atob,
but this is not necessary, because those are both defined on the
XPCShell global (by glob_functions in XPCShellImpl.cpp). It sounds
like it didn't work at some point on B2G (see bug 937114) but that
isn't relevant any more. I want to fix this because the way these
properties are imported will break with shared JSM globals.

MozReview-Commit-ID: HoxqIS98p7B

--HG--
extra : rebase_source : 7800baee8ebc5e3ab3f52a62e30e5cde8d19876b
2017-06-21 09:56:57 -07:00
Wes Kocher
ac0fd2038c Merge inbound to m-c a=merge
MozReview-Commit-ID: 3LXFVwSoMvs
2017-06-21 17:58:17 -07:00
Nathan Froyd
b28fcc5c4b Bug 1372670 - part 5 - add nsIThreadManager::spinEventLoopUntilEmpty; r=erahm,florian
A number of places in JS need to drain the current thread's event queue,
which cannot be done with nsIThreadManager::spinEventLoopUntil, since we
need to not wait for an incoming event when attempting to process one.
2017-06-21 12:59:28 -04:00
Nathan Froyd
27c58cf89f Bug 1372670 - part 3 - add spinEventLoopUntil to nsIThreadManager; r=erahm,florian 2017-06-21 12:59:28 -04:00
Carsten "Tomcat" Book
8a1350b5a6 Backed out changeset 4f6302a98ae4 (bug 1372405)
--HG--
extra : rebase_source : 41632f3158e88e692809731394a683d065a73dfb
2017-06-21 13:59:26 +02:00
Mark Hammond
a1b09f054d Bug 1374599 - neuter the sync scheduler during some tests to avoid oranges. r=standard8
MozReview-Commit-ID: Ihun5yu3hit

--HG--
extra : rebase_source : 9448411e072d144456e7672b92699cdf288a13fc
2017-06-21 14:53:07 +10:00
Wes Kocher
c0e1236f1a Merge autoland to m-c a=merge
MozReview-Commit-ID: LFtpTAueYrF
2017-06-20 18:24:29 -07:00
Paolo Amadini
375f5f7210 Bug 1362970 - Part 3 - Fix indentation and one misuse of "catch". r=florian
MozReview-Commit-ID: 2oFOmye7EUr

--HG--
extra : rebase_source : 1b575a89ff3f0dc7683f1c25bde12de6859c17be
extra : source : eb61cf8f77d22f0cf026056615a475c2e04f932a
2017-06-16 11:16:00 +01:00
Paolo Amadini
10ee6a5c4e Bug 1362970 - Part 2 - Script-generated patch to convert .then(null, ...) to .catch(...). r=florian
Changes to Promise tests designed to test .then(null) have been reverted, and the browser/extensions directory was excluded because the projects it contains have a separate process for accepting changes.

MozReview-Commit-ID: 1buqgX1EP4P

--HG--
extra : rebase_source : 3a9ea310d3e4a8642aabbc10636c04bfe2e77070
2017-06-19 11:32:37 +01:00
Carsten "Tomcat" Book
de892834ed Merge mozilla-central to mozilla-inbound 2017-06-20 11:31:34 +02:00
Thom Chiovoloni
a208081e56 Bug 1357798 - Ensure URLs don't end up in sync error telemetry. r=markh
MozReview-Commit-ID: AxFzysv0ks3

--HG--
extra : rebase_source : 6b2aa9354ed9540c5cdb8f537eaca7080c97a4eb
2017-06-12 13:38:39 -04:00
Thom Chiovoloni
c3972efec6 Bug 1368393 - Handle already synced commands in clients collection duplicate checking r=eoger,markh
MozReview-Commit-ID: Hs0Jh8mMlOp

--HG--
extra : rebase_source : 8a8bae7330210547d128c322abed773cb73895e5
2017-06-09 12:07:43 -04:00
Edouard Oger
b599411285 Bug 1369119 - Refresh known stale devices list on FxA device disconnect. r=markh
MozReview-Commit-ID: A2iqas0kP20

--HG--
extra : rebase_source : 15db886e4751885e173a55c561df7ea1a3b2871b
2017-06-06 14:28:00 -04:00
Carsten "Tomcat" Book
ea1b86680c Backed out changeset 9846de3bd954 (bug 1372405)
--HG--
extra : rebase_source : 5d4a48e8ec394c329994689d938d2a6e9b2752b0
2017-06-20 08:27:02 +02:00
Bill McCloskey
4592152411 Bug 1372405 - Provide names for all runnables in the tree (r=froydnj)
MozReview-Commit-ID: DKR6ROiHRS7
2017-06-19 22:25:47 -07:00
Bevis Tseng
d1637b9c5a Bug 1372453 - Part 2: Name the caller of ProxyReleaseEvent. r=billm
MozReview-Commit-ID: LYhSWnZkq0i
2017-06-14 09:27:17 +08:00
Mark Banner
d030707609 Bug 1095426 - Convert JSON backups code to the new async Bookmarks.jsm API. r=mak
MozReview-Commit-ID: FNZZGwWVSI2

--HG--
extra : rebase_source : dacb3c5ddb439d074c66e0baaa7e73044c5dcd46
2017-05-12 08:04:51 +01:00
Marco Bonardo
1d88de7d2f Bug 1371945 - Avoid a possible thread-safety problem with unfinalized statements. r=asuth
Avoids a thread-safety race condition on shutdown where we could try to finalize a statement twice.
Allows the async thread to be referenced until ShutdownAsyncThread, so async finalizers can make use of it.
Removes the no more useful mAsyncExecutionThreadIsAlive.
Nullifies the sqlite3_mutex pointer when the connection is closed, since it would be a dangling pointer.
Use a ScopeExit to ensure the connection and the mutex pointers are always nullified on failure.
Makes asyncClose bailout early if a Close method was already invoked before.
Makes AsyncInitDatabase not use AsyncClose to just shutdown the async thread.
Fixes various unfinalized statements in consumers code.
Makes mConnectionClosed better follow mDBConn status.
Replaces some mutex locking isClosed() calls with lockless isConnectionReadyOnThisThread.

MozReview-Commit-ID: 6sftFehsQTt

--HG--
extra : rebase_source : 2bf3088b500376e58e62e8f078d9950588adc649
2017-06-16 17:43:23 +02:00
Bill McCloskey
6b3e84ed5f Bug 1372405 - Provide names for all runnables in the tree (r=froydnj)
MozReview-Commit-ID: DKR6ROiHRS7
2017-06-20 21:44:11 -07:00
Masatoshi Kimura
3231cb3535 Bug 1372886 - Remove dead parameters from nsIConverterInputStream.init(). r=hsivonen
MozReview-Commit-ID: GliLHLsUWjt

--HG--
extra : rebase_source : 50d3f4680a498125ddf600b0d64f6740b0229f80
2017-06-17 19:30:09 +09:00
Edouard Oger
a1f2f47f82 Bug 1363412 - Notify other clients when uploading the local clients record for the first time. r=markh
MozReview-Commit-ID: Ldc3Jrj8RhV

--HG--
extra : rebase_source : 44bdeaa962ddbcb748f9e5a01871fd2ff7d6a676
2017-06-12 14:51:17 -04:00
Edouard Oger
1826fefb4c Bug 1370985 - Change getBatched() to return records directly instead of using a callback. r=markh,tcsc
MozReview-Commit-ID: HfwPe8jSH66

--HG--
extra : rebase_source : 12c8800f1fcc090589c2a94a0fc1608b36c54181
2017-05-30 13:23:57 -04:00
ffxbld
120e57745f Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2017-06-12 13:48:15 +01:00
Edouard Oger
adde19d4f4 Bug 1369855 - Update sinon.js to version 2.3.2. r=markh
MozReview-Commit-ID: FPB4HebP3g7

--HG--
extra : rebase_source : 1e55c1dbc8bff59e1a7a097e4a6a58a19bc95688
2017-06-02 15:50:30 -04:00
Mark Hammond
96faa14e58 Bug 1370736 - reset the sync login status after an FxA login event. r=eoger
MozReview-Commit-ID: 6BLj6q8z79i

--HG--
extra : rebase_source : 350bc8d6c6e5581082c9b1a50b3517b93d70db52
2017-06-07 16:41:18 +10:00
tiago
1fdf6c19a7 Bug 1356281 - Remove bookmark contents from sync debug logs. r=tcsc
MozReview-Commit-ID: HsMH5mpCK8C

--HG--
extra : rebase_source : 26853fa867257a6c0a914ed903f9d8e253c86e8f
2017-05-19 04:40:15 -03:00
Mathieu Leplatre
7d9c066f35 Bug 1254099 - Add Telemetry to settings update r=bsmedberg,glasserc,mgoodwin,rhelmer
MozReview-Commit-ID: 8vAuTImx7IH

--HG--
extra : rebase_source : 15995e30bd1fdb697eb2374a0c28c68e0828e1e6
2017-03-22 11:27:17 +01:00
tiago
19362d0bfa Bug 1354016 - Forms validator ignore clientMissing. r=tcsc
MozReview-Commit-ID: C2FD58C9HzS

--HG--
extra : rebase_source : f5b627342e7fa4915914cbfd3e54003fe6d94c1e
2017-06-01 22:32:23 -03:00
Mark Hammond
dc01c77702 Bug 1369285 - update how we build the default sync device name. r=tcsc
MozReview-Commit-ID: 6eY8IzKg9kd

--HG--
extra : rebase_source : ae321d48de0144c29fa4f40fd16a02c44539d795
2017-06-01 16:57:02 +10:00
Edouard Oger
9d1dc7c4a7 Bug 1368560 part 2 - Move Svc.Crypto to Weave.Crypto. r=markh
MozReview-Commit-ID: 74IFsVjZSgz

--HG--
extra : rebase_source : 00f77b7a24a509d5e9fabb8ee7793a59b38f639f
2017-05-29 13:24:01 -04:00
Edouard Oger
2c61cf7eb4 Bug 1368560 part 1 - Remove un-used legacy crypto methods. r=markh
MozReview-Commit-ID: JbzweOMFLpR

--HG--
extra : rebase_source : f7cece36dce26c96a740aede6c696deb08345a90
2017-05-29 17:27:13 -04:00
Edouard Oger
0c6026b415 Bug 1369092 - Listen to onverified events in UIState. r=markh
MozReview-Commit-ID: 8nfmpaz9obF

--HG--
extra : rebase_source : 736673d0c1245b81ea9f419f08b943c3ce26a8e6
2017-05-31 12:02:28 -04:00
Sebastian Hengst
9768267be1 Backed out changeset bf392a1d0c5a (bug 1368560) for failing xpcshell's test_ext_storage_sync.js and test_ext_storage_sync_crypto.js on Linux. r=backout on a CLOSED TREE 2017-05-31 22:53:16 +02:00
Sebastian Hengst
a9f8675d96 Backed out changeset c2d00a8b897b (bug 1368560) 2017-05-31 22:52:14 +02:00
Edouard Oger
275b48a53e Bug 1368560 part 2 - Move Svc.Crypto to Weave.Crypto. r=markh
MozReview-Commit-ID: 74IFsVjZSgz

--HG--
extra : rebase_source : 29833856a9cca178a2b508b6401cdb6bd8ca1bb9
2017-05-29 13:24:01 -04:00
Edouard Oger
198e8ab1d1 Bug 1368560 part 1 - Remove un-used legacy crypto methods. r=markh
MozReview-Commit-ID: JbzweOMFLpR

--HG--
extra : rebase_source : f7cece36dce26c96a740aede6c696deb08345a90
2017-05-29 17:27:13 -04:00
Mark Hammond
71a24b858a Bug 1366994 - prevent appDisabled addons from hanging sync. r=tcsc
MozReview-Commit-ID: 4RRCPlwUZrG

--HG--
extra : rebase_source : 8ab03af402dc15432252b74a120da286b810302f
2017-05-26 12:42:10 +10:00
Edouard Oger
f8e13dd94c Bug 1353645 - Record account verification status determination method telemetry. r=bsmedberg,gfritzsche,markh
MozReview-Commit-ID: GETlknx8Fse

--HG--
extra : rebase_source : b56da3d0309b91ee7d908e9246d7921ebd7ed03d
2017-05-16 16:59:51 -04:00
tiago
7386600327 Bug 1366081 - Excise 'mobileGUIDFetchBatchSize' and other mobile sync-related constants. r=kitcambridge
MozReview-Commit-ID: 6JTtpWFFyvD

--HG--
extra : rebase_source : f6ca75e91ca38d0d1ba18ff79a0872d96a878954
2017-05-24 03:28:22 -03:00
Ethan Glasser-Camp
f9f6f160da Bug 1364135: Clean up detection/handling of deleted keyrings, r=kmag,MattN
MozReview-Commit-ID: CoOwUazDRSL

--HG--
extra : rebase_source : d027c47f1b5740fa9916420b5dafdac935264ff8
2017-05-11 13:15:20 -04:00
milindl
fc8d285e3d Bug 1036440 - Fix tests and consumers for rewritten PlacesDBUtils, r=mak
This includes 2 things:
1. Replacing the parts which test the logs for the presence of prefixes by testing
the returned map for `suceeded`.
2. We don't need to wait to observe the topic anymore, we can simply await methods
from `PlacesDBUtils` to know when they are done.

MozReview-Commit-ID: Ct9l9pzUW5x

--HG--
extra : rebase_source : 657e4ac53f8b3785740a5b732d483fad9600f73d
2017-05-24 11:00:47 +05:30
Thom Chiovoloni
85291791fd Bug 1367585 - Add the 'load' event listener before adding the new tab in sync's TPS tests r=markh
MozReview-Commit-ID: HUUHYnLf4m8

--HG--
extra : rebase_source : f0ac2cadf4f5345f854e8ad8ca3e7be37485a0cf
2017-05-24 17:58:55 -04:00
Thom Chiovoloni
1e07d66113 Bug 1367543 - Make sync's TPS tests handle cases where resyncs are triggered r=kitcambridge
MozReview-Commit-ID: 4owlGyLw5jU

--HG--
extra : rebase_source : bdfca8806ed76c2398c845880f4b7c65bd3dffd3
2017-05-24 16:16:23 -04:00
udara
d53c05ca28 Bug 1367525 - Remove extra error logging during device disconnect. r=eoger
MozReview-Commit-ID: JgFvBlGwsxZ

--HG--
extra : rebase_source : ef9cfb41112d8974f8e1ef5a138e4cfddfdc6386
2017-05-24 15:19:35 -04:00
Edouard Oger
99947c9c38 Bug 1353307 - Add main process start time to sync ping. r=gfritzsche,markh
MozReview-Commit-ID: DbSZUmO0tuf

--HG--
extra : rebase_source : e13afbd5829b86b7bee5c82a7a1ff09263e9dc3f
2017-05-16 17:43:49 -04:00
Edouard Oger
c4e6a8f382 Bug 1365375 - Disconnect Sync on account destroyed. r=markh
MozReview-Commit-ID: EVySp2JOgsT

--HG--
extra : rebase_source : e60612d8dedcf46170cf58f47bde2c979ab99d3f
2017-05-23 19:22:49 -04:00
Ryan VanderMeulen
4202c4feab Merge m-c to autoland. a=merge 2017-05-23 18:13:54 -04:00
Kit Cambridge
df2d03a198 Bug 973166 - Only track passwords with changes to synced fields. r=eoger
MozReview-Commit-ID: 8ZOyVCaZIi8

--HG--
extra : rebase_source : 8252c5a9ad718594872d5bda38e04528cd227f44
2017-05-22 17:21:20 -07:00
Ryan VanderMeulen
c92175874c Backed out changeset d11aec13b38e (bug 1365375) for eslint failures. 2017-05-23 13:36:50 -04:00
Edouard Oger
69602ba5f2 Bug 1365375 - Disconnect Sync on account destroyed. r=markh
This connects to the fxa-auth-server PR:
https://github.com/mozilla/fxa-auth-server/pull/1900

MozReview-Commit-ID: IIYnytYGIpw

--HG--
extra : rebase_source : 04a6adb81252c0c4aa0eaaa01b68e3943791aadc
2017-05-17 16:25:00 -04:00
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
Ryan VanderMeulen
1734a80650 Merge m-c to inbound. a=merge 2017-05-23 11:15:49 -04:00
Shane Tomlinson
7a827756f9 Bug 1308038 - Add handshake capability to share state with FxA. r=markh, r=rkelly 2017-02-02 09:16:54 +00: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
Edouard Oger
c8bcf1e705 Bug 1351915 - Fire onItemChanged when deduping sync bookmarks. r=kitcambridge
MozReview-Commit-ID: JHaCz42aRwx

--HG--
extra : rebase_source : 38361447a7900c55dc56cc5b528be5045181fee2
2017-04-08 19:57:39 -04:00
Florian Queze
4c6a68d1c9 Bug 1355161 - script-generated patch to replace .{currentThread,mainThread}.dispatch(..., Ci.nsIThread.DISPATCH_NORMAL) with .dispatchToMainThread(...), r=froydnj. 2017-04-14 18:29:12 +02:00
Florian Queze
f935ddc4b3 Bug 1356569 - Remove notifyObservers' last parameter when it is falsy, r=jaws. 2017-04-14 21:51:39 +02:00
Florian Queze
37ff4fc7cc Bug 1356569 - Remove addObserver's last parameter when it is false, r=jaws. 2017-04-14 21:51:38 +02:00
Sebastian Hengst
159215e6f4 Backed out changeset 18d45aa984d6 (bug 1355161) 2017-04-14 23:39:23 +02:00
Sebastian Hengst
a07223d699 Backed out changeset 322fde2d53bf (bug 1356569) so bug 1355161 can be backed out. r=backout 2017-04-14 23:39:22 +02:00
Sebastian Hengst
738d097aae Backed out changeset 55f3df15eaa6 (bug 1356569) 2017-04-14 23:39:17 +02:00
Florian Queze
3c564a2b02 Bug 1356569 - Remove notifyObservers' last parameter when it is falsy, r=jaws. 2017-04-14 21:51:39 +02:00
Florian Queze
95d4d20c17 Bug 1356569 - Remove addObserver's last parameter when it is false, r=jaws. 2017-04-14 21:51:38 +02:00
Florian Queze
a363fb8c8b Bug 1355161 - script-generated patch to replace .{currentThread,mainThread}.dispatch(..., Ci.nsIThread.DISPATCH_NORMAL) with .dispatchToMainThread(...), r=froydnj. 2017-04-14 18:29:12 +02:00
Thom Chiovoloni
daf505ef20 Bug 595314 - Add TPS test ensuring that new changes to existing bookmarks are respected by sync r=markh
MozReview-Commit-ID: B2A60B3ufYb

--HG--
extra : rebase_source : bc30afdc09497f9bcdda85493f02faa8fe8afb17
2017-04-05 12:39:00 -04:00
Thom Chiovoloni
3c9fc16ebc Bug 1345744 - Ensure an error log is written when sync (newly) fails to apply records. r=markh
MozReview-Commit-ID: 586faUBtX6n

--HG--
extra : rebase_source : 7e1d0eab656838f3718260a11ef8cd2d9b501d17
2017-04-04 14:18:09 -04:00
hrishikesh
ea83c7b70d Bug 1351906 - Moved log.trace before return statement to fix unreachable code issue in history.js. r=Standard8 2017-04-05 11:03:01 +05:30
Nathan Froyd
1a5c10bc46 Bug 1348454 - use a single thread for IdentityCryptoService; r=jesup
Rather than starting a single thread for every key generation and key
signing operation started by IdentityCryptoService, and then leaking
those threads, we can at least start a single thread to be used by all
operations and leak that instead.
2017-04-03 15:41:54 -04:00
Edouard Oger
d09f746bfb Bug 1345955 - Update FxA profile when push notification received. r=markh
MozReview-Commit-ID: 4LL6F5Qnnj4

--HG--
extra : rebase_source : 00bc6a445d22fdfb626e7af6ad62fb750f444460
2017-03-16 17:15:18 -04:00
Carsten "Tomcat" Book
74e36e1adb Merge mozilla-central to autoland on a CLOSED TREE
--HG--
extra : amend_source : 5026c19958cdc458c0f0887582fd00b8038fe93e
2017-03-30 16:48:10 +02:00
Florian Queze
0ac961905a Bug 1351659 - Use jwcrypto.jsm with the resource://services-crypto prefix, r=markh. 2017-03-30 09:18:45 +02:00
Edouard Oger
557fa7b36a Bug 1350665 - Disable sync repair tests on beta and release. r=kitcambridge
MozReview-Commit-ID: 6anD2FJ2aQ2

--HG--
extra : rebase_source : 708b1c52d0ecbad5407d3d27db0c5d14c8bfa73e
2017-03-29 15:27:25 -04:00
Thom Chiovoloni
f189ba9211 Bug 1349703 - (part 3) Delete a test from TPS that was testing that we made the wrong decision during reconciliation r=kitcambridge
MozReview-Commit-ID: KVRcVNJAKfg

--HG--
extra : rebase_source : c37b394f0a97488f783db0b751ea2f5f9c454f8d
2017-03-23 17:18:32 -04:00
Thom Chiovoloni
250adc135f Bug 1349703 - (part 2) Fix intermittent TPS failures caused by failing cleanup by waiting longer before starting r=kitcambridge
MozReview-Commit-ID: D07eRgqHVOu

--HG--
extra : rebase_source : e08a57c3340cfd22bde9009c8cc960859b719eed
2017-03-23 16:34:04 -04:00
Thom Chiovoloni
908a695b92 Bug 1349703 - (part 1) Fix issue where sync would fail misreconcile special folders in fresh syncs r=kitcambridge
MozReview-Commit-ID: Izy9JgMYpom

--HG--
extra : rebase_source : b740e81aafbabae2947fd26888c677065742db96
2017-03-23 16:32:40 -04:00
Edouard Oger
2f0a83abc1 Bug 1339340 - Repair items the bookmark validator reports as missing on the client or server. r=tcsc
MozReview-Commit-ID: 9Wxq2wfUnkb

--HG--
extra : rebase_source : 133133eb765a403a77ca3bbd0d8302c0a0be49a0
2017-03-24 11:12:48 -04:00
Sebastian Hengst
7ebbcc1624 Backed out changeset 16d562074791 (bug 1339340) for failing xpcshell test services/sync/tests/unit/test_doctor.js. r=backout 2017-03-24 00:52:29 +01:00
Edouard Oger
125d3015c3 Bug 1339340 - Repair items the bookmark validator reports as missing on the client or server. r=tcsc
MozReview-Commit-ID: 9Wxq2wfUnkb

--HG--
extra : rebase_source : 8dfe36e5c2d75291e07d61341648dec95b5dd213
2017-03-14 18:02:20 -04:00
Kit Cambridge
55c8025ae4 Bug 1349709 - Ensure PasswordEngine conforms to the new pullAllChanges interface. r=tcsc
This was a regression from bug 1317223. This commit also adds a
password engine sync test to catch future regressions.

MozReview-Commit-ID: 9dq8K39jLwB

--HG--
extra : rebase_source : 346c4abaf639f7781426f4e06e988c76cf552422
2017-03-22 19:21:08 -07:00
Edouard Oger
d20541b101 Bug 692700 part 2 - Set X-If-Unmodified-Since when uploading crypto/keys. r=markh
MozReview-Commit-ID: 9qrr8vuvy1I

--HG--
extra : rebase_source : 9c20bdec7a33d0cde2e31c3109bf3cb9665352ba
2017-03-14 15:56:08 -04:00
Edouard Oger
1ee65dc313 Bug 692700 part 1 - Set X-If-Unmodified-Since when uploading meta/global. r=markh
MozReview-Commit-ID: IoiThiDlvCj

--HG--
extra : rebase_source : f78434e661810f9b42da6d58422713fd20687e28
2017-03-14 14:42:24 -04:00
Zibi Braniecki
3d91da8726 Bug 1347314 - Migrate calls to ChromeRegistry::GetSelectedLocale to use LocaleService::GetAppLocale. r=jfkthame,Pike
In cases, where the caller is looking for the locale to be used for JS Intl API,
we can now replace it with `undefined` which causes JS Intl API to use the default
locale which since bug 1346674 is resolved to the app locale.

This allows us to remove a lot of calls for the app locale.

The remaining ones are split between `AsBCP47` and `AsLangTag`.
Here, the `AsLangTag` is used, as described in the API docs, for cases where
the language string is used for localization purposes, such as language negotaition
matching to our language resources etc.
`AsBCP47` is used when the returned value is handed over to ICU API.

MozReview-Commit-ID: DzmFEUvMq3N

--HG--
extra : rebase_source : 513ed31d995864939aa893e73c81ffdf591a6617
2017-03-14 16:09:54 -07:00
Sebastian Hengst
0a04f3b9e2 Backed out changeset cc308a73ad05 (bug 1347314) for eslint failure in test_device.html. r=backout 2017-03-22 18:20:26 +01:00
Zibi Braniecki
c2cd68a689 Bug 1347314 - Migrate calls to ChromeRegistry::GetSelectedLocale to use LocaleService::GetAppLocale. r=jfkthame,Pike
In cases, where the caller is looking for the locale to be used for JS Intl API,
we can now replace it with `undefined` which causes JS Intl API to use the default
locale which since bug 1346674 is resolved to the app locale.

This allows us to remove a lot of calls for the app locale.

The remaining ones are split between `AsBCP47` and `AsLangTag`.
Here, the `AsLangTag` is used, as described in the API docs, for cases where
the language string is used for localization purposes, such as language negotaition
matching to our language resources etc.
`AsBCP47` is used when the returned value is handed over to ICU API.

MozReview-Commit-ID: DzmFEUvMq3N

--HG--
extra : rebase_source : 13fa4c397ba4c79303a2cd76684b5b8c4bd17331
2017-03-14 16:09:54 -07:00
Kit Cambridge
c4565c993a Bug 1343093 - Add integration test for bookmark repair. r=markh
This test replaces the clients engine to simulate two different
clients, and uses `SOURCE_SYNC` to bypass change tracking.

MozReview-Commit-ID: IF3b3WZtain

--HG--
extra : rebase_source : deff5eb74dcbc29d7e7556b4ce6e15590ee4d4a0
2017-03-21 11:54:06 -07:00
Mark Banner
bd625e4e9f Bug 1347712 - Change the testing configurations into ESLint configurations within eslint-plugin-mozilla - automatically update .eslintrc.js test config files for new config locations. r=jaws
MozReview-Commit-ID: LH0CQOPfoe6

--HG--
extra : rebase_source : 83eaf40c5cbb5e25cfb3f3b5afadf4fbf0422c92
2017-03-20 12:36:37 +01:00