kallithea Changeset - 5f3101d54c32

Changeset - 5f3101d54c32

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 6 years ago 2019-12-26 15:14:55
mads@kiilerich.com

Grafted from: 52b913f63494

vcs: drop special character encodings and some hardcoded UTF-8 - just use safe_unicode/safe_bytes

4 files changed with 7 insertions and 11 deletions:

kallithea/lib/vcs/backends/git/changeset.py

kallithea/lib/vcs/backends/git/inmemory.py

kallithea/lib/vcs/backends/hg/inmemory.py

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -445,14 +445,12 @@ class GitChangeset(BaseChangeset): @@
     def get_node(self, path):
         """
         Returns ``Node`` object from the given ``path``. If there is no node at
         the given ``path``, ``ChangesetError`` would be raised.
         """
         if isinstance(path, unicode):
             path = path.encode('utf-8')
         path = self._fix_path(path)
         if path not in self.nodes:
             try:
                 id_ = self._get_id_for_path(path)
             except ChangesetError:
                 raise NodeDoesNotExistError("Cannot find one of parents' "

kallithea/lib/vcs/backends/git/inmemory.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ import stat @@
 import time
 from dulwich import objects
 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError
 from kallithea.lib.vcs.utils import safe_str
+from kallithea.lib.vcs.utils import safe_bytes, safe_str
 class GitInMemoryChangeset(BaseInMemoryChangeset):
     def commit(self, message, author, parents=None, branch=None, date=None,
                **kwargs):
@@ @@ -36,13 +36,13 @@ class GitInMemoryChangeset(BaseInMemoryC @@
         if branch is None:
             branch = GitRepository.DEFAULT_BRANCH_NAME
         repo = self.repository._repo
         object_store = repo.object_store
         ENCODING = "UTF-8"
+        ENCODING = "UTF-8"  # TODO: should probably be kept in sync with safe_unicode/safe_bytes and vcs/conf/settings.py DEFAULT_ENCODINGS
         # Create tree and populates it with blobs
         commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or \
             objects.Tree()
         for node in self.added + self.changed:
             # Compute subdirs if needed
@@ @@ -71,13 +71,13 @@ class GitInMemoryChangeset(BaseInMemoryC @@
             if not node.is_binary:
                 content = node.content.encode(ENCODING)
             else:
                 content = node.content
             blob = objects.Blob.from_string(content)
-            node_path = node.name.encode(ENCODING)
+            node_path = safe_bytes(node.name)
             if dirnames:
                 # If there are trees which should be created we need to build
                 # them now (in reverse order)
                 reversed_dirnames = list(reversed(dirnames))
                 curtree = objects.Tree()
                 curtree[node_path] = node.mode, blob.id

kallithea/lib/vcs/backends/hg/inmemory.py

➞

Show inline comments

 import datetime
 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError
 from kallithea.lib.vcs.utils.hgcompat import hex, memctx, memfilectx, tolocal
 from kallithea.lib.vcs.utils import safe_bytes
 from kallithea.lib.vcs.utils.hgcompat import hex, memctx, memfilectx
 class MercurialInMemoryChangeset(BaseInMemoryChangeset):
     def commit(self, message, author, parents=None, branch=None, date=None,
             **kwargs):
@@ @@ -84,17 +85,15 @@ class MercurialInMemoryChangeset(BaseInM @@
             files=self.get_paths(),
             filectxfn=filectxfn,
             user=author,
             date=date,
             extra=kwargs)
         loc = lambda u: tolocal(u.encode('utf-8'))
         # injecting given _repo params
         commit_ctx._text = loc(message)
         commit_ctx._user = loc(author)
         commit_ctx._text = safe_bytes(message)
         commit_ctx._user = safe_bytes(author)
         commit_ctx._date = date
         # TODO: Catch exceptions!
         n = self.repository._repo.commitctx(commit_ctx)
         # Returns mercurial node
         self._commit_ctx = commit_ctx  # For reference

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -6,13 +6,12 @@ import mercurial @@
 from mercurial import archival, config, demandimport, discovery, httppeer, localrepo
 from mercurial import merge as hg_merge
 from mercurial import obsutil, patch, scmutil, sshpeer, ui, unionrepo
 from mercurial.commands import clone, nullid, pull
 from mercurial.context import memctx, memfilectx
 from mercurial.discovery import findcommonoutgoing
 from mercurial.encoding import tolocal
 from mercurial.error import Abort, RepoError, RepoLookupError
 from mercurial.hg import peer
 from mercurial.hgweb import hgweb_mod
 from mercurial.hgweb.common import get_contact
 from mercurial.match import exact as match_exact
 from mercurial.match import match

0 comments (0 inline, 0 general)