Show More
@@ -74,10 +74,14 b' class PullrequestsController(BaseRepoCon' | |||||
74 | def _get_repo_refs(self, repo, rev=None, branch_rev=None): |
|
74 | def _get_repo_refs(self, repo, rev=None, branch_rev=None): | |
75 | """return a structure with repo's interesting changesets, suitable for |
|
75 | """return a structure with repo's interesting changesets, suitable for | |
76 | the selectors in pullrequest.html""" |
|
76 | the selectors in pullrequest.html""" | |
77 |
|
||||
78 | # list named branches that has been merged to this named branch - it should probably merge back |
|
77 | # list named branches that has been merged to this named branch - it should probably merge back | |
79 | peers = [] |
|
78 | peers = [] | |
|
79 | ||||
|
80 | if rev: | |||
|
81 | rev = safe_str(rev) | |||
|
82 | ||||
80 | if branch_rev: |
|
83 | if branch_rev: | |
|
84 | branch_rev = safe_str(branch_rev) | |||
81 | # not restricting to merge() would also get branch point and be better |
|
85 | # not restricting to merge() would also get branch point and be better | |
82 | # (especially because it would get the branch point) ... but is currently too expensive |
|
86 | # (especially because it would get the branch point) ... but is currently too expensive | |
83 | revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" % |
|
87 | revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" % |
General Comments 0
You need to be logged in to leave comments.
Login now