kallithea Changeset - 3c91ec4419a6

Changeset - 3c91ec4419a6

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Mads Kiilerich - 13 years ago 2013-01-31 23:27:21
madski@unity3d.com

pull requeset: move stuff around, preparing for next change

- and make sure we don't pass unicode to Mercurial

1 file changed with 19 insertions and 15 deletions:

rhodecode/model/pull_request.py

0 comments (0 inline, 0 general)

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -37,12 +37,13 @@ from rhodecode.model.db import PullReque @@
     ChangesetStatus
 from rhodecode.model.notification import NotificationModel
 from rhodecode.lib.utils2 import safe_unicode
 from rhodecode.lib.vcs.utils.hgcompat import discovery, localrepo, scmutil, \
     findcommonoutgoing
 from rhodecode.lib.vcs.utils import safe_str
 log = logging.getLogger(__name__)
 class PullRequestModel(BaseModel):
@@ @@ -171,18 +172,32 @@ class PullRequestModel(BaseModel): @@
         :param tmp:
         """
         changesets = []
         if alias == 'hg':
             # lookup up the exact node id
             _revset_predicates = {
                     'branch': 'branch',
                     'book': 'bookmark',
                     'tag': 'tag',
                     'rev': 'id',
+                }
             org_rev_spec = "%s('%s')" % (_revset_predicates[org_ref[0]],
                                          safe_str(org_ref[1]))
             org_rev = scmutil.revsingle(org_repo._repo,
                                          org_rev_spec)
             other_rev_spec = "%s('%s')" % (_revset_predicates[other_ref[0]],
                                            safe_str(other_ref[1]))
             other_rev = scmutil.revsingle(other_repo._repo, other_rev_spec)
             #case two independent repos
             if org_repo != other_repo:
                 revs = [
                     org_repo._repo.lookup(org_ref[1]),
                     org_repo._repo.lookup(other_ref[1]),
+                    org_repo._repo.lookup(other_ref[1]), # lookup up in the wrong repo!
+                ]
                 obj = findcommonoutgoing(org_repo._repo,
                             localrepo.locallegacypeer(other_repo._repo.local()),
                             revs,
                             force=True)
@@ @@ -197,25 +212,14 @@ class PullRequestModel(BaseModel): @@
                     start = org_ref[1]
                     stop = other_ref[1]
                     changesets = changesets[revs.index(start):revs.index(stop) + 1]
             #no remote compare do it on the same repository
             else:
                 _revset_predicates = {
                         'branch': 'branch',
                         'book': 'bookmark',
                         'tag': 'tag',
                         'rev': 'id',
+                    }
                 revs = [
                     "ancestors(%s('%s')) and not ancestors(%s('%s'))" % (
                         _revset_predicates[other_ref[0]], other_ref[1],
                         _revset_predicates[org_ref[0]], org_ref[1],
+                   )
+                ]
                 revs = ["ancestors(id('%s')) and not ancestors(id('%s'))" %
                         (other_rev, org_rev)]
                 out = scmutil.revrange(org_repo._repo, revs)
                 for cs in (out):
                     changesets.append(org_repo.get_changeset(cs))
         elif alias == 'git':
@@ @@ -229,13 +233,13 @@ class PullRequestModel(BaseModel): @@
                 changesets.append(org_repo.get_changeset(cs))
         return changesets
     def get_compare_data(self, org_repo, org_ref, other_repo, other_ref):
         """
-        Returns incomming changesets for mercurial repositories
+        Returns incoming changesets for mercurial repositories
         :param org_repo:
         :type org_repo:
         :param org_ref:
         :type org_ref:
         :param other_repo:

0 comments (0 inline, 0 general)