This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6623

py3: store _origdoc as str
ClosedPublic

Authored by martinvonz on Jul 9 2019, 3:15 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG83666f011679: py3: store _origdoc as str
Summary

Since doc is str, it seems natural that _origdoc also is.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 9 2019, 3:15 AM
martinvonz added inline comments.Jul 10 2019, 12:31 PM
hgext/show.py
463–464

Hmm, I guess I should have just used r'' here. I'll update that.

martinvonz added a commit: rHG83666f011679: py3: store _origdoc as str.Jul 10 2019, 3:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG83666f011679: py3: store _origdoc as str (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/show.py (4 lines)
Mmercurial/registrar.py (4 lines)

Diff 15877

hgext/show.py

# This is a bit hacky because it runs at the end of module load. When moved # This is a bit hacky because it runs at the end of module load. When moved
# into core or when another extension wants to provide a view, we'll need # into core or when another extension wants to provide a view, we'll need
# to do this more robustly. # to do this more robustly.
# TODO make this more robust. # TODO make this more robust.
def _updatedocstring(): def _updatedocstring():
longest = max(map(len, showview._table.keys())) longest = max(map(len, showview._table.keys()))
entries = [] entries = []
for key in sorted(showview._table.keys()): for key in sorted(showview._table.keys()):
entries.append(pycompat.sysstr(' %s %s' % ( entries.append(r' %s %s' % (
key.ljust(longest), showview._table[key]._origdoc))) pycompat.sysstr(key.ljust(longest)), showview._table[key]._origdoc))
martinvonzAuthorUnsubmitted
Done

Hmm, I guess I should have just used r'' here. I'll update that.

martinvonz: Hmm, I guess I should have just used r'' here. I'll update that.
cmdtable['show'][0].__doc__ = pycompat.sysstr('%s\n\n%s\n ') % ( cmdtable['show'][0].__doc__ = pycompat.sysstr('%s\n\n%s\n ') % (
cmdtable['show'][0].__doc__.rstrip(), cmdtable['show'][0].__doc__.rstrip(),
pycompat.sysstr('\n\n').join(entries)) pycompat.sysstr('\n\n').join(entries))
_updatedocstring() _updatedocstring()

mercurial/registrar.py

def _doregister(self, func, decl, *args, **kwargs): def _doregister(self, func, decl, *args, **kwargs):
name = self._getname(decl) name = self._getname(decl)
if name in self._table: if name in self._table:
msg = 'duplicate registration for name: "%s"' % name msg = 'duplicate registration for name: "%s"' % name
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
if func.__doc__ and not util.safehasattr(func, '_origdoc'): if func.__doc__ and not util.safehasattr(func, '_origdoc'):
doc = pycompat.sysbytes(func.__doc__).strip() func._origdoc = func.__doc__.strip()
func._origdoc = doc doc = pycompat.sysbytes(func._origdoc)
func.__doc__ = pycompat.sysstr(self._formatdoc(decl, doc)) func.__doc__ = pycompat.sysstr(self._formatdoc(decl, doc))
self._table[name] = func self._table[name] = func
self._extrasetup(name, func, *args, **kwargs) self._extrasetup(name, func, *args, **kwargs)
return func return func
def _merge(self, registrarbase): def _merge(self, registrarbase):