# HG changeset patch # User Augie Fackler # Date 2016-08-23 15:26:08 # Node ID d5883fd055c6eab69027c5585000325e92bfca99 # Parent 4435d4c951ec2185d92cbe0041852767dda584c8 extensions: change magic "shipped with hg" string I've caught multiple extensions in the wild lying about being 'internal', so it's time to move the goalposts on people. Goalpost moving will continue until third party extensions stop trying to defeat the system. diff --git a/contrib/synthrepo.py b/contrib/synthrepo.py --- a/contrib/synthrepo.py +++ b/contrib/synthrepo.py @@ -62,11 +62,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' cmdtable = {} command = cmdutil.command(cmdtable) diff --git a/hgext/acl.py b/hgext/acl.py --- a/hgext/acl.py +++ b/hgext/acl.py @@ -204,11 +204,11 @@ from mercurial import ( urlreq = util.urlreq -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def _getusers(ui, group): diff --git a/hgext/blackbox.py b/hgext/blackbox.py --- a/hgext/blackbox.py +++ b/hgext/blackbox.py @@ -51,11 +51,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' lastui = None filehandles = {} diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -294,11 +294,11 @@ from mercurial import ( urlparse = util.urlparse xmlrpclib = util.xmlrpclib -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' class bzaccess(object): '''Base class for access to Bugzilla.''' diff --git a/hgext/censor.py b/hgext/censor.py --- a/hgext/censor.py +++ b/hgext/censor.py @@ -42,11 +42,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('censor', [('r', 'rev', '', _('censor file from specified revision'), _('REV')), diff --git a/hgext/chgserver.py b/hgext/chgserver.py --- a/hgext/chgserver.py +++ b/hgext/chgserver.py @@ -63,11 +63,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' _log = commandserver.log diff --git a/hgext/children.py b/hgext/children.py --- a/hgext/children.py +++ b/hgext/children.py @@ -26,11 +26,11 @@ templateopts = commands.templateopts cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('children', [('r', 'rev', '', diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -26,11 +26,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def maketemplater(ui, repo, tmpl): return cmdutil.changeset_templater(ui, repo, False, None, tmpl, None, False) diff --git a/hgext/clonebundles.py b/hgext/clonebundles.py --- a/hgext/clonebundles.py +++ b/hgext/clonebundles.py @@ -169,7 +169,7 @@ from mercurial import ( wireproto, ) -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def capabilities(orig, repo, proto): caps = orig(repo, proto) diff --git a/hgext/color.py b/hgext/color.py --- a/hgext/color.py +++ b/hgext/color.py @@ -170,11 +170,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # start and stop parameters for effects _effects = {'none': 0, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -23,11 +23,11 @@ from . import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # Commands definition was moved elsewhere to ease demandload job. diff --git a/hgext/eol.py b/hgext/eol.py --- a/hgext/eol.py +++ b/hgext/eol.py @@ -104,11 +104,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # Matches a lone LF, i.e., one that is not part of CRLF. singlelf = re.compile('(^|[^\r])\n') diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -84,11 +84,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def snapshot(ui, repo, files, node, tmproot, listsubrepos): '''snapshot files as of some revision diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -26,11 +26,11 @@ from mercurial import ( release = lock.release cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('fetch', [('r', 'rev', [], diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py +++ b/hgext/fsmonitor/__init__.py @@ -113,11 +113,11 @@ from . import ( watchmanclient, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # This extension is incompatible with the following blacklisted extensions # and will disable itself when encountering one of these: diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -23,11 +23,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' class gpg(object): def __init__(self, path, key=None): diff --git a/hgext/graphlog.py b/hgext/graphlog.py --- a/hgext/graphlog.py +++ b/hgext/graphlog.py @@ -25,11 +25,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('glog', [('f', 'follow', None, diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -54,11 +54,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('debug-diff-tree', [('p', 'patch', None, _('generate patch')), diff --git a/hgext/highlight/__init__.py b/hgext/highlight/__init__.py --- a/hgext/highlight/__init__.py +++ b/hgext/highlight/__init__.py @@ -41,11 +41,11 @@ from mercurial import ( fileset, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def pygmentize(web, field, fctx, tmpl): style = web.config('web', 'pygments_style', 'colorful') diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -213,11 +213,11 @@ class _constraints(object): def known(cls): return set([v for k, v in cls.__dict__.items() if k[0] != '_']) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' actiontable = {} primaryactions = set() diff --git a/hgext/journal.py b/hgext/journal.py --- a/hgext/journal.py +++ b/hgext/journal.py @@ -39,11 +39,11 @@ from . import share cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # storage format version; increment when the format changes storageversion = 0 diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -112,11 +112,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # hg commands that do not act on keywords nokwcommands = ('add addremove annotate bundle export grep incoming init log' diff --git a/hgext/largefiles/__init__.py b/hgext/largefiles/__init__.py --- a/hgext/largefiles/__init__.py +++ b/hgext/largefiles/__init__.py @@ -119,11 +119,11 @@ from . import ( uisetup as uisetupmod, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' reposetup = reposetup.reposetup diff --git a/hgext/logtoprocess.py b/hgext/logtoprocess.py --- a/hgext/logtoprocess.py +++ b/hgext/logtoprocess.py @@ -40,11 +40,11 @@ import platform import subprocess import sys -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def uisetup(ui): if platform.system() == 'Windows': diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -99,11 +99,11 @@ seriesopts = [('s', 'summary', None, _(' cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # force load strip extension formerly included in mq and import some utility try: diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py @@ -148,11 +148,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # template for single changeset can include email headers. single_template = ''' diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -75,11 +75,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def _runpager(ui, p): pager = subprocess.Popen(p, shell=True, bufsize=-1, diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -87,11 +87,11 @@ stringio = util.stringio cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def _addpullheader(seq, ctx): """Add a header pointing to a public URL where the changeset is available diff --git a/hgext/purge.py b/hgext/purge.py --- a/hgext/purge.py +++ b/hgext/purge.py @@ -38,11 +38,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('purge|clean', [('a', 'abort-on-err', None, _('abort if an error occurs')), diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -66,11 +66,11 @@ revskipped = (revignored, revprecursor, cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def _nothingtorebase(): return 1 diff --git a/hgext/record.py b/hgext/record.py --- a/hgext/record.py +++ b/hgext/record.py @@ -22,11 +22,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command("record", diff --git a/hgext/relink.py b/hgext/relink.py --- a/hgext/relink.py +++ b/hgext/relink.py @@ -21,11 +21,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('relink', [], _('[ORIGIN]')) def relink(ui, repo, origin=None, **opts): diff --git a/hgext/schemes.py b/hgext/schemes.py --- a/hgext/schemes.py +++ b/hgext/schemes.py @@ -56,11 +56,11 @@ from mercurial import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' class ShortRepository(object): diff --git a/hgext/share.py b/hgext/share.py --- a/hgext/share.py +++ b/hgext/share.py @@ -56,11 +56,11 @@ parseurl = hg.parseurl cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' @command('share', [('U', 'noupdate', None, _('do not create a working directory')), diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -54,11 +54,11 @@ from . import ( cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' backupdir = 'shelve-backup' shelvedir = 'shelved' diff --git a/hgext/strip.py b/hgext/strip.py --- a/hgext/strip.py +++ b/hgext/strip.py @@ -23,11 +23,11 @@ release = lockmod.release cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' def checksubstate(repo, baserev=None): '''return list of subrepos at a different revision than substate. diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -40,11 +40,11 @@ class TransplantError(error.Abort): cmdtable = {} command = cmdutil.command(cmdtable) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' class transplantentry(object): def __init__(self, lnode, rnode): diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -55,11 +55,11 @@ from mercurial import ( error, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' _encoding = None # see extsetup diff --git a/hgext/win32text.py b/hgext/win32text.py --- a/hgext/win32text.py +++ b/hgext/win32text.py @@ -52,11 +52,11 @@ from mercurial import ( util, ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # regexp for single LF without CR preceding. re_single_lf = re.compile('(^|[^\r])\n', re.MULTILINE) diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -40,11 +40,11 @@ from mercurial.hgweb import ( server as servermod ) -# Note for extension authors: ONLY specify testedwith = 'internal' for +# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. -testedwith = 'internal' +testedwith = 'ships-with-hg-core' # publish diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2396,6 +2396,10 @@ def debugextensions(ui, **opts): for extname, extmod in sorted(exts, key=operator.itemgetter(0)): extsource = extmod.__file__ exttestedwith = getattr(extmod, 'testedwith', '').split() + if exttestedwith == ['ships-with-hg-core']: + showtestedwith = ['internal'] + else: + showtestedwith = exttestedwith extbuglink = getattr(extmod, 'buglink', None) fm.startitem() @@ -2406,7 +2410,8 @@ def debugextensions(ui, **opts): fm.write('name', '%s', extname) if not exttestedwith: fm.plain(_(' (untested!)\n')) - elif exttestedwith == ['internal'] or hgver in exttestedwith: + elif (exttestedwith == ['ships-with-hg-core'] + or hgver in exttestedwith): fm.plain('\n') else: lasttestedversion = exttestedwith[-1] @@ -2415,9 +2420,9 @@ def debugextensions(ui, **opts): fm.condwrite(ui.verbose and extsource, 'source', _(' location: %s\n'), extsource or "") - fm.condwrite(ui.verbose and exttestedwith, 'testedwith', + fm.condwrite(ui.verbose and showtestedwith, 'testedwith', _(' tested with: %s\n'), - fm.formatlist(exttestedwith, name='ver')) + fm.formatlist(showtestedwith, name='ver')) fm.condwrite(ui.verbose and extbuglink, 'buglink', _(' bug reporting: %s\n'), extbuglink or "") diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -927,7 +927,7 @@ def _exceptionwarning(ui): break # Never blame on extensions bundled with Mercurial. - if testedwith == 'internal': + if testedwith == 'ships-with-hg-core': continue tested = [util.versiontuple(t, 2) for t in testedwith.split()] diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -532,4 +532,4 @@ def moduleversion(module): def ismoduleinternal(module): exttestedwith = getattr(module, 'testedwith', None) - return exttestedwith == "internal" + return exttestedwith == "ships-with-hg-core"