kallithea Changeset - c72dbcad0337

Changeset - c72dbcad0337

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-02-12 23:09:24
marcin@python-works.com

fix some small unicode issues with logging on differ

1 file changed with 5 insertions and 4 deletions:

rhodecode/lib/diffs.py

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ from itertools import tee, imap @@
 from pylons.i18n.translation import _
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.lib.helpers import escape
 from rhodecode.lib.utils2 import safe_unicode
+from rhodecode.lib.utils2 import safe_unicode, safe_str
 log = logging.getLogger(__name__)
 def wrap_to_table(str_):
     return '''<table class="code-difftable">
@@ @@ -700,17 +700,18 @@ def differ(org_repo, org_ref, other_repo @@
     org_repo_scm = org_repo.scm_instance
     other_repo_scm = other_repo.scm_instance
     org_repo = org_repo_scm._repo
     other_repo = other_repo_scm._repo
     org_ref = org_ref[1]
     other_ref = other_ref[1]
     org_ref = safe_str(org_ref[1])
     other_ref = safe_str(other_ref[1])
     if org_repo_scm == other_repo_scm:
         log.debug('running diff between %s@%s and %s@%s'
                   % (org_repo.path, org_ref, other_repo.path, other_ref))
                   % (org_repo.path, org_ref,
                      other_repo.path, other_ref))
         _diff = org_repo_scm.get_diff(rev1=org_ref, rev2=other_ref,
             ignore_whitespace=ignore_whitespace, context=context)
         return _diff
     return '' # FIXME: when is it ever relevant to return nothing?

0 comments (0 inline, 0 general)