kallithea Changeset - f00117816704

Changeset - f00117816704

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 5 0

Mads Kiilerich - 6 years ago 2019-09-27 01:12:38
mads@kiilerich.com

Merge stable

2 files changed with 11 insertions and 6 deletions:

kallithea/controllers/pullrequests.py

kallithea/model/user.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -527,15 +527,20 @@ class PullrequestsController(BaseRepoCon @@
                         # also show changesets that not are descendants but would be merged in
                         targethead = other_scm_instance.get_changeset(c.a_branch_name).raw_id
                         if org_scm_instance.path != other_scm_instance.path:
                             # Note: org_scm_instance.path must come first so all
                             # valid revision numbers are 100% org_scm compatible
                             # - both for avail_revs and for revset results
                             hgrepo = unionrepo.unionrepository(org_scm_instance.baseui,
                                                                org_scm_instance.path,
                                                                other_scm_instance.path)
                             try:
                                 hgrepo = unionrepo.makeunionrepository(org_scm_instance.baseui,
                                                                        org_scm_instance.path,
                                                                        other_scm_instance.path)
                             except AttributeError: # makeunionrepository was introduced in Mercurial 4.8 23f2299e9e53
                                 hgrepo = unionrepo.unionrepository(org_scm_instance.baseui,
                                                                    org_scm_instance.path,
                                                                    other_scm_instance.path)
                         else:
                             hgrepo = org_scm_instance._repo
                         show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s',
                                                avail_revs, revs[0], targethead))
                         if show:
                             c.update_msg = _('The following additional changes are available on %s:') % c.cs_branch_name

kallithea/model/user.py

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ import traceback @@
 from sqlalchemy.exc import DatabaseError
 from tg import config
 from tg.i18n import ugettext as _
 from kallithea.lib.caching_query import FromCache
 from kallithea.lib.exceptions import DefaultUserException, UserOwnsReposException
-from kallithea.lib.utils2 import generate_api_key, get_current_authuser, safe_str
+from kallithea.lib.utils2 import generate_api_key, get_current_authuser, safe_unicode
 from kallithea.model.db import Permission, User, UserEmailMap, UserIpMap, UserToPerm
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)
@@ @@ -139,15 +139,15 @@ class UserModel(object): @@
         try:
             new_user.username = username
             new_user.admin = admin
             new_user.email = email
             new_user.active = active
-            new_user.extern_name = safe_str(extern_name) \
+            new_user.extern_name = safe_unicode(extern_name) \
                 if extern_name else None
-            new_user.extern_type = safe_str(extern_type) \
+            new_user.extern_type = safe_unicode(extern_type) \
                 if extern_type else None
             new_user.name = firstname
             new_user.lastname = lastname
             if not edit:
                 new_user.api_key = generate_api_key()

0 comments (0 inline, 0 general)