[PATCH] phabricator: drop support for the deprecated `phabricator.token` config

Matt Harbison mharbison72 at gmail.com
Fri May 11 21:16:09 EDT 2018


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1526004793 14400
#      Thu May 10 22:13:13 2018 -0400
# Node ID 35b230be2610a6ba4b6d6b60e228ec4a8ddfdfae
# Parent  3ac950cd597857af7797f75bb3a6b4c3694cc79c
phabricator: drop support for the deprecated `phabricator.token` config

diff --git a/contrib/phabricator.py b/contrib/phabricator.py
--- a/contrib/phabricator.py
+++ b/contrib/phabricator.py
@@ -21,10 +21,6 @@ Config::
     # Phabricator URL
     url = https://phab.example.com/
 
-    # API token. Get it from https://$HOST/conduit/login/
-    # Deprecated: see [phabricator.auth] below
-    #token = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
     # Repo callsign. If a repo has a URL https://$HOST/diffusion/FOO, then its
     # callsign is "FOO".
     callsign = FOO
@@ -104,21 +100,6 @@ def urlencodenested(params):
     process('', params)
     return util.urlreq.urlencode(flatparams)
 
-printed_token_warning = False
-
-def readlegacytoken(repo):
-    """Transitional support for old phabricator tokens.
-
-    Remove before the 4.6 release.
-    """
-    global printed_token_warning
-    token = repo.ui.config('phabricator', 'token')
-    if token and not printed_token_warning:
-        printed_token_warning = True
-        repo.ui.warn(_('phabricator.token is deprecated - please '
-                       'migrate to the phabricator.auth section.\n'))
-    return token
-
 def readurltoken(repo):
     """return conduit url, token and make sure they exist
 
@@ -148,10 +129,8 @@ def readurltoken(repo):
             break
 
     if not token:
-        token = readlegacytoken(repo)
-        if not token:
-            raise error.Abort(_('Can\'t find conduit token associated to %s')
-                              % (url,))
+        raise error.Abort(_('Can\'t find conduit token associated to %s')
+                          % (url,))
 
     return url, token
 


More information about the Mercurial-devel mailing list