##// END OF EJS Templates
fix some small unicode issues with logging on differ
marcink -
r3366:c72dbcad beta
parent child Browse files
Show More
@@ -37,7 +37,7 b' from rhodecode.lib.vcs.exceptions import'
37 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
37 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
38 from rhodecode.lib.vcs.backends.base import EmptyChangeset
38 from rhodecode.lib.vcs.backends.base import EmptyChangeset
39 from rhodecode.lib.helpers import escape
39 from rhodecode.lib.helpers import escape
40 from rhodecode.lib.utils2 import safe_unicode
40 from rhodecode.lib.utils2 import safe_unicode, safe_str
41
41
42 log = logging.getLogger(__name__)
42 log = logging.getLogger(__name__)
43
43
@@ -703,12 +703,13 b' def differ(org_repo, org_ref, other_repo'
703 org_repo = org_repo_scm._repo
703 org_repo = org_repo_scm._repo
704 other_repo = other_repo_scm._repo
704 other_repo = other_repo_scm._repo
705
705
706 org_ref = org_ref[1]
706 org_ref = safe_str(org_ref[1])
707 other_ref = other_ref[1]
707 other_ref = safe_str(other_ref[1])
708
708
709 if org_repo_scm == other_repo_scm:
709 if org_repo_scm == other_repo_scm:
710 log.debug('running diff between %s@%s and %s@%s'
710 log.debug('running diff between %s@%s and %s@%s'
711 % (org_repo.path, org_ref, other_repo.path, other_ref))
711 % (org_repo.path, org_ref,
712 other_repo.path, other_ref))
712 _diff = org_repo_scm.get_diff(rev1=org_ref, rev2=other_ref,
713 _diff = org_repo_scm.get_diff(rev1=org_ref, rev2=other_ref,
713 ignore_whitespace=ignore_whitespace, context=context)
714 ignore_whitespace=ignore_whitespace, context=context)
714 return _diff
715 return _diff
General Comments 0
You need to be logged in to leave comments. Login now