kallithea Changeset - b095a92a4312

Changeset - b095a92a4312

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich (mads) - 5 years ago 2020-10-29 11:38:10
mads@kiilerich.com

Grafted from: ef144335e79a

lib: drop h.email alias - use vcs.utils directly

3 files changed with 6 insertions and 10 deletions:

kallithea/controllers/files.py

kallithea/lib/helpers.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -48,12 +48,13 @@ from kallithea.lib.utils import action_l @@
 from kallithea.lib.utils2 import asbool, convert_line_endings, detect_mode, safe_str
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.conf import settings
 from kallithea.lib.vcs.exceptions import (ChangesetDoesNotExistError, ChangesetError, EmptyRepositoryError, ImproperArchiveTypeError, NodeAlreadyExistsError,
                                           NodeDoesNotExistError, NodeError, RepositoryError, VCSError)
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.utils import author_email
 from kallithea.lib.webutils import url
 from kallithea.model.repo import RepoModel
 from kallithea.model.scm import ScmModel
 log = logging.getLogger(__name__)
@@ @@ -167,13 +168,13 @@ class FilesController(BaseRepoController @@
                 c.file_history = []
                 if c.load_full_history:
                     c.file_history, _hist = self._get_node_history(c.changeset, f_path)
                 c.authors = []
                 for a in set([x.author for x in _hist]):
-                    c.authors.append((h.email(a), h.person(a)))
+                    c.authors.append((author_email(a), h.person(a)))
             else:
                 c.authors = c.file_history = []
         except RepositoryError as e:
             h.flash(e, category='error')
             raise HTTPNotFound()
@@ @@ -219,13 +220,13 @@ class FilesController(BaseRepoController @@
         changeset = self.__get_cs(revision)
         _file = changeset.get_node(f_path)
         if _file.is_file():
             file_history, _hist = self._get_node_history(changeset, f_path)
             c.authors = []
             for a in set([x.author for x in _hist]):
-                c.authors.append((h.email(a), h.person(a)))
+                c.authors.append((author_email(a), h.person(a)))
             return render('files/files_history_box.html')
     @LoginRequired(allow_default_user=True)
     @HasRepoPermissionLevelDecorator('read')
     def rawfile(self, repo_name, revision, f_path):
         cs = self.__get_cs(revision)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -539,14 +539,12 @@ def pop_flash_messages(): @@
     return [_Message(category, message) for category, message in _session_flash_messages(clear=True)]
 def capitalize(x):
     return x.capitalize()
 email = author_email
 def short_id(x):
     return x[:12]
 def hide_credentials(x):
     return ''.join(credentials_filter(x))
@@ @@ -633,13 +631,13 @@ def person(author, show_attr="username") @@
     value = user_attr_or_none(author, show_attr)
     if value is not None:
         return value
     # Still nothing?  Just pass back the author name if any, else the email
-    return author_name(author) or email(author)
+    return author_name(author) or author_email(author)
 def person_by_id(id_, show_attr="username"):
     # maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -46,12 +46,13 @@ from webob.exc import HTTPNotFound @@
 import kallithea
 from kallithea.lib import ext_json, ssh
 from kallithea.lib.exceptions import DefaultUserException
 from kallithea.lib.utils2 import asbool, ascii_bytes, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_bytes, safe_int, safe_str, urlreadable
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.utils import author_email, author_name
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.model import meta
 log = logging.getLogger(__name__)
@@ @@ -588,19 +589,15 @@ class User(meta.Base, BaseDbModel): @@
         return ret
     @classmethod
     def get_from_cs_author(cls, author):
         """
         Tries to get User objects out of commit author string
         :param author:
         """
         from kallithea.lib.helpers import author_name, email
         # Valid email in the attribute passed, see if they're in the system
-        _email = email(author)
+        _email = author_email(author)
         if _email:
             user = cls.get_by_email(_email)
             if user is not None:
                 return user
         # Maybe we can match by username?
         _author = author_name(author)

0 comments (0 inline, 0 general)