ansible/hg-ssh: remove advertise upgrade hook from global hgrc (bug 1392183)
authorGregory Szorc <gps@mozilla.com>
Mon, 18 Sep 2017 12:56:42 -0700
changeset 5584 f254a80cbc80
parent 5583 bb016ecabb9a
child 5585 2e064a8680b1
push id2568
push usergszorc@mozilla.com
push date2017-09-18 22:04 +0000
bugs1392183
ansible/hg-ssh: remove advertise upgrade hook from global hgrc (bug 1392183) This hook was ported to use the new extension-based infrastructure in 9cf56a1f7744. The old filename no longer exists and the hook is loaded automatically. So remove the reference in the global hgrc.
ansible/roles/hg-ssh/templates/hgrc.j2
hgserver/tests/test-push-basic.t
--- a/ansible/roles/hg-ssh/templates/hgrc.j2
+++ b/ansible/roles/hg-ssh/templates/hgrc.j2
@@ -10,17 +10,16 @@ from = hg@hg.mozilla.org
 showfunc = True
 git = 1
 unified = 8
 
 [hooks]
 sorthooks = True
 changegroup.a_recordlogs = /var/hg/version-control-tools/scripts/record-pushes.sh
 changegroup.push_printurls = python:mozhghooks.push_printurls.hook
-changegroup.z_advertize_upgrade = python:mozhghooks.advertise_upgrade.hook
 #pretxnchangegroup.renamecase = python:mozhghooks.prevent_case_only_renames.hook
 # Disabled because too many people are running into issues. Need more
 # granular checking for now. Bug 787620.
 #pretxnchangegroup.author_format = python:mozhghooks.author_format.hook
 
 pretxnclose.populate_caches = python:mozhghooks.populate_caches.hook
 
 [extensions]
--- a/hgserver/tests/test-push-basic.t
+++ b/hgserver/tests/test-push-basic.t
@@ -68,17 +68,17 @@ Blackbox logging recorded appropriate en
   * user1@example.com @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-served with 0 tags (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2 with 0 tags (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnclose: mozhghooks.populate_caches.hook finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnclose: hgext_vcsreplicator.pretxnclosehook finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pushkey: hgext_vcsreplicator.pushkeyhook finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-txnclose: hgext_vcsreplicator.txnclosehook finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> exthook-changegroup.a_recordlogs: /var/hg/version-control-tools/scripts/record-pushes.sh finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: mozhghooks.push_printurls.hook finished in * seconds (glob)
-  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: mozhghooks.advertise_upgrade.hook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: hgext_mozhooks.changegroup finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: hgext_vcsreplicator.changegrouphook finished in * seconds (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 77538e1ce4be (glob)
   * user1@example.com @0000000000000000000000000000000000000000 (*)> -R /repo/hg/mozilla/mozilla-central serve --stdio exited 0 after * seconds (glob)
 
 It got replicated to mirrors
 
   $ hgmo exec hgweb0 /var/hg/venv_replication/bin/vcsreplicator-consumer --wait-for-no-lag /etc/mercurial/vcsreplicator.ini
 
@@ -138,17 +138,21 @@ Upgrade notice is advertised to clients 
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   remote: recorded push in pushlog
   remote: 
   remote: View your change here:
   remote:   https://hg.mozilla.org/mozilla-central/rev/425a9d45c43d833916e3c803300ba4488374ac0e
   remote: 
+  remote: *************************************** WARNING ****************************************
   remote: YOU ARE PUSHING WITH AN OUT OF DATE MERCURIAL CLIENT!
-  remote: newer versions are faster and have numerous bug fixes
-  remote: upgrade instructions are at the following URL:
+  remote: 
+  remote: Newer versions are faster and have numerous bug fixes.
+  remote: Upgrade instructions are at the following URL:
   remote: https://mozilla-version-control-tools.readthedocs.io/en/latest/hgmozilla/installing.html
-  remote: recorded changegroup in replication log in \d+\.\d+s (re)
+  remote: ****************************************************************************************
+  remote: 
+  remote: recorded changegroup in replication log in 0.021s
 
 Cleanup
 
   $ hgmo clean