kallithea Changeset - 2c0208bd686b

Changeset - 2c0208bd686b

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 request: shuffle different-repo and hg-git conditionals around, no code change

1 file changed with 35 insertions and 30 deletions:

rhodecode/model/pull_request.py

0 comments (0 inline, 0 general)

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -151,98 +151,103 @@ class PullRequestModel(BaseModel): @@
     def delete(self, pull_request):
         pull_request = self.__get_pull_request(pull_request)
         Session().delete(pull_request)
     def close_pull_request(self, pull_request):
         pull_request = self.__get_pull_request(pull_request)
         pull_request.status = PullRequest.STATUS_CLOSED
         pull_request.updated_on = datetime.datetime.now()
         self.sa.add(pull_request)
     def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref):
         """
         Returns a list of changesets that are incoming from org_repo@org_ref
         to other_repo@other_ref
         :param org_repo:
         :param org_ref:
         :param other_repo:
         :param other_ref:
         :param tmp:
         """
         changesets = []
         #case two independent repos
         if org_repo != other_repo:
             revs = [
                 org_repo._repo.lookup(org_ref[1]),
                 org_repo._repo.lookup(other_ref[1]),
+            ]
             obj = findcommonoutgoing(org_repo._repo,
                         localrepo.locallegacypeer(other_repo._repo.local()),
                         revs,
                         force=True)
             revs = obj.missing
         if alias == 'hg':
             for cs in map(binascii.hexlify, revs):
                 _cs = org_repo.get_changeset(cs)
                 changesets.append(_cs)
             # in case we have revisions filter out the ones not in given range
             if org_ref[0] == 'rev' and other_ref[0] == 'rev':
                 revs = [x.raw_id for x in changesets]
                 start = org_ref[1]
                 stop = other_ref[1]
                 changesets = changesets[revs.index(start):revs.index(stop) + 1]
         else:
             #case two independent repos
             if org_repo != other_repo:
                 revs = [
                     org_repo._repo.lookup(org_ref[1]),
                     org_repo._repo.lookup(other_ref[1]),
+                ]
                 obj = findcommonoutgoing(org_repo._repo,
                             localrepo.locallegacypeer(other_repo._repo.local()),
                             revs,
                             force=True)
                 revs = obj.missing
                 for cs in map(binascii.hexlify, revs):
                     _cs = org_repo.get_changeset(cs)
                     changesets.append(_cs)
                 # in case we have revisions filter out the ones not in given range
                 if org_ref[0] == 'rev' and other_ref[0] == 'rev':
                     revs = [x.raw_id for x in changesets]
                     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
-            if alias == 'hg':
+            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],
+                   )
+                ]
                 out = scmutil.revrange(org_repo._repo, revs)
                 for cs in (out):
                     changesets.append(org_repo.get_changeset(cs))
             elif alias == 'git':
                 so, se = org_repo.run_git_command(
                     'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],
                                                                      other_ref[1])
+                )
                 ids = re.findall(r'[0-9a-fA-F]{40}', so)
                 for cs in (ids):
                     changesets.append(org_repo.get_changeset(cs))
         elif alias == 'git':
             assert org_repo == other_repo, (org_repo, other_repo) # no git support for different repos
             so, se = org_repo.run_git_command(
                 'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],
                                                                        other_ref[1])
+            )
             ids = re.findall(r'[0-9a-fA-F]{40}', so)
             for cs in (ids):
                 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
         :param org_repo:
         :type org_repo:
         :param org_ref:
         :type org_ref:
         :param other_repo:
         :type other_repo:
         :param other_ref:
         :type other_ref:
         """
         if len(org_ref) != 2 or not isinstance(org_ref, (list, tuple)):
             raise Exception('org_ref must be a two element list/tuple')
         if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):
             raise Exception('other_ref must be a two element list/tuple')
         org_repo_scm = org_repo.scm_instance

0 comments (0 inline, 0 general)