| Submitter | Augie Fackler |
|---|---|
| Date | Nov. 25, 2015, 1:53 p.m. |
| Message ID | <b05270c486ea46e4ff3d.1448459609@imladris.local> |
| Download | mbox | patch |
| Permalink | /patch/11658/ |
| State | Accepted |
| Delegated to: | Yuya Nishihara |
| Headers | show |
Comments
On Wed, 25 Nov 2015 08:53:29 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler <augie@google.com> > # Date 1448408416 18000 > # Tue Nov 24 18:40:16 2015 -0500 > # Node ID b05270c486ea46e4ff3d488d7e48fc9aea4326d7 > # Parent 9de814b35808827d55980a438be18a2846612b13 > 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. Fixed error in test-help.t and pushed to the clowncopter, thanks. > -# former extensions now in core - we ignore these if found in hgrc > -_builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify']) > +_builtin = ['hbisect', 'bookmarks', 'parentrevspec', 'progress', 'interhg', > + 'inotify'] Added set() again assuming it was removed unintentionally by rebase.
Patch
diff --git a/hgext/progress.py b/hgext/progress.py deleted file mode 100644 --- a/hgext/progress.py +++ /dev/null @@ -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 --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -24,8 +24,8 @@ from . import ( _extensions = {} _aftercallbacks = {} _order = [] -# former extensions now in core - we ignore these if found in hgrc -_builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify']) +_builtin = ['hbisect', 'bookmarks', 'parentrevspec', 'progress', 'interhg', + 'inotify'] def extensions(ui=None): if ui: