Mercurial > kallithea

changeset 3719:3534e75b2d5b beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: don't pass unicode strings to Mercurial
author Mads Kiilerich <madski@unity3d.com>
date Fri, 05 Apr 2013 02:49:26 +0200
parents b2575bdb847c
children 9855b31d033b
files rhodecode/controllers/pullrequests.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py	Fri Apr 05 00:40:58 2013 +0200
+++ b/rhodecode/controllers/pullrequests.py	Fri Apr 05 02:49:26 2013 +0200
@@ -74,10 +74,14 @@
     def _get_repo_refs(self, repo, rev=None, branch_rev=None):
         """return a structure with repo's interesting changesets, suitable for
         the selectors in pullrequest.html"""
-
         # list named branches that has been merged to this named branch - it should probably merge back
         peers = []
+
+        if rev:
+            rev = safe_str(rev)
+
         if branch_rev:
+            branch_rev = safe_str(branch_rev)
             # not restricting to merge() would also get branch point and be better
             # (especially because it would get the branch point) ... but is currently too expensive
             revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" %