Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: store _origdoc as str
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 09 Jul 2019 00:03:10 -0700
changeset 42596 83666f011679
parent 42595 819712deac69
child 42597 51e52a495214
py3: store _origdoc as str Since __doc__ is str, it seems natural that _origdoc also is. Differential Revision: https://phab.mercurial-scm.org/D6623
hgext/show.py file | annotate | diff | comparison | revisions
mercurial/registrar.py file | annotate | diff | comparison | revisions 
--- a/hgext/show.py	Fri Jun 28 12:59:21 2019 -0700
+++ b/hgext/show.py	Tue Jul 09 00:03:10 2019 -0700
@@ -460,8 +460,8 @@
     longest = max(map(len, showview._table.keys()))
     entries = []
     for key in sorted(showview._table.keys()):
-        entries.append(pycompat.sysstr('    %s   %s' % (
-            key.ljust(longest), showview._table[key]._origdoc)))
+        entries.append(r'    %s   %s' % (
+            pycompat.sysstr(key.ljust(longest)), showview._table[key]._origdoc))
 
     cmdtable['show'][0].__doc__ = pycompat.sysstr('%s\n\n%s\n    ') % (
         cmdtable['show'][0].__doc__.rstrip(),
--- a/mercurial/registrar.py	Fri Jun 28 12:59:21 2019 -0700
+++ b/mercurial/registrar.py	Tue Jul 09 00:03:10 2019 -0700
@@ -64,8 +64,8 @@
             raise error.ProgrammingError(msg)
 
         if func.__doc__ and not util.safehasattr(func, '_origdoc'):
-            doc = pycompat.sysbytes(func.__doc__).strip()
-            func._origdoc = doc
+            func._origdoc = func.__doc__.strip()
+            doc = pycompat.sysbytes(func._origdoc)
             func.__doc__ = pycompat.sysstr(self._formatdoc(decl, doc))
 
         self._table[name] = func
mercurial