| Submitter | Kevin Bullock |
|---|---|
| Date | Nov. 1, 2017, 6:25 p.m. |
| Message ID | <fe304d17c0d495febfb1.1509560711@ingalls.local> |
| Download | mbox | patch |
| Permalink | /patch/25317/ |
| State | Accepted |
| Headers | show |
Comments
rebased & queued, thanks > On Nov 1, 2017, at 14:25, Kevin Bullock <kbullock+mercurial@ringworld.org> wrote: > > # HG changeset patch > # User Kevin Bullock <kbullock+mercurial@ringworld.org> > # Date 1509560648 18000 > # Wed Nov 01 13:24:08 2017 -0500 > # Branch stable > # Node ID fe304d17c0d495febfb1324fb25118570d7a0778 > # Parent ff2110eadbfa92d4e5d54c8b6068969583aa54ee > internals: copy-edit "register" -> "registrar" in configitem docs > > diff --git a/mercurial/help.py b/mercurial/help.py > --- a/mercurial/help.py > +++ b/mercurial/help.py > @@ -202,7 +202,7 @@ internalstable = sorted([ > loaddoc('censor', subdir='internals')), > (['changegroups'], _('Changegroups'), > loaddoc('changegroups', subdir='internals')), > - (['config'], _('Config Register'), > + (['config'], _('Config Registrar'), > loaddoc('config', subdir='internals')), > (['requirements'], _('Repository Requirements'), > loaddoc('requirements', subdir='internals')), > diff --git a/mercurial/help/internals/config.txt b/mercurial/help/internals/config.txt > --- a/mercurial/help/internals/config.txt > +++ b/mercurial/help/internals/config.txt > @@ -88,13 +88,13 @@ The ``dynamicdefault`` object is then av > Supporting older version > ------------------------ > > -The register was introduced in Mercurial 4.3, the ``generic`` parameter was > +The registrar was introduced in Mercurial 4.3, the ``generic`` parameter was > introduced in 4.4. Starting with Mercurial 4.4, all core options were registered > and developer warnings are emitted when accessing unregistered option. > > Extensions supporting version older than Mercurial-4.3 cannot rely on the > -default value registered. The simplest way to register option while still > -supporting older version is to use ``dynamicdefault`` for option requiring a > +default value registered. The simplest way to register an option while still > +supporting older version is to use ``dynamicdefault`` for the option requiring a > default value. The existing code passing an explicit default can then stay in > use until compatibility to Mercurial 4.2 is dropped. > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -202,7 +202,7 @@ internalstable = sorted([ loaddoc('censor', subdir='internals')), (['changegroups'], _('Changegroups'), loaddoc('changegroups', subdir='internals')), - (['config'], _('Config Register'), + (['config'], _('Config Registrar'), loaddoc('config', subdir='internals')), (['requirements'], _('Repository Requirements'), loaddoc('requirements', subdir='internals')), diff --git a/mercurial/help/internals/config.txt b/mercurial/help/internals/config.txt --- a/mercurial/help/internals/config.txt +++ b/mercurial/help/internals/config.txt @@ -88,13 +88,13 @@ The ``dynamicdefault`` object is then av Supporting older version ------------------------ -The register was introduced in Mercurial 4.3, the ``generic`` parameter was +The registrar was introduced in Mercurial 4.3, the ``generic`` parameter was introduced in 4.4. Starting with Mercurial 4.4, all core options were registered and developer warnings are emitted when accessing unregistered option. Extensions supporting version older than Mercurial-4.3 cannot rely on the -default value registered. The simplest way to register option while still -supporting older version is to use ``dynamicdefault`` for option requiring a +default value registered. The simplest way to register an option while still +supporting older version is to use ``dynamicdefault`` for the option requiring a default value. The existing code passing an explicit default can then stay in use until compatibility to Mercurial 4.2 is dropped.