# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1448408416 18000
# Node ID 0214cc0a0e976e3745497ac11baaac86a2fadbe9
# Parent  cb74f206d39b5a525da14b6c306ccdfa02b3d1c7
extensions: properly mark progress as part of core

This should have been done as part of or as an immediate follow-up to
f5c906878a47, but presumably this feature of extensions.py was
forgotten at that time.

diff -r cb74f206d39b -r 0214cc0a0e97 hgext/progress.py
--- a/hgext/progress.py	Fri Nov 27 23:10:48 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# progress.py show progress bars for some actions
-#
-# Copyright (C) 2010 Augie Fackler <durin42@gmail.com>
-#
-# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
-
-"""show progress bars for some actions (DEPRECATED)
-
-This extension has been merged into core, you can remove it from your config.
-See hg help config.progress for configuration options.
-"""
-# Note for extension authors: ONLY specify testedwith = 'internal' 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'
diff -r cb74f206d39b -r 0214cc0a0e97 mercurial/extensions.py
--- a/mercurial/extensions.py	Fri Nov 27 23:10:48 2015 +0900
+++ b/mercurial/extensions.py	Tue Nov 24 18:40:16 2015 -0500
@@ -24,8 +24,8 @@
 _extensions = {}
 _aftercallbacks = {}
 _order = []
-#  former extensions now in core - we ignore these if found in hgrc
-_builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify'])
+_builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'progress', 'interhg',
+                'inotify'])
 
 def extensions(ui=None):
     if ui: