kallithea Changeset - b44fabc4377c

Changeset - b44fabc4377c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-06-26 00:13:15
madski@unity3d.com

compare: resolve revisions in the right repository for diffs between repos

1 file changed with 7 insertions and 7 deletions:

rhodecode/controllers/compare.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -45,25 +45,25 @@ from rhodecode.model.db import Repositor @@
 from webob.exc import HTTPBadRequest
 from rhodecode.lib.diffs import LimitedDiffContainer
 log = logging.getLogger(__name__)
 class CompareController(BaseRepoController):
     def __before__(self):
         super(CompareController, self).__before__()
-    def __get_cs_or_redirect(self, ref, repo, redirect_after=True,
+    def __get_rev_or_redirect(self, ref, repo, redirect_after=True,
                              partial=False):
         """
         Safe way to get changeset if error occur it redirects to changeset with
         proper message. If partial is set then don't do redirect raise Exception
         instead
         :param rev: revision to fetch
         :param repo: repo instance
         """
         rev = ref[1] # default and used for git
         if repo.scm_instance.alias == 'hg':
@@ @@ -72,25 +72,25 @@ class CompareController(BaseRepoControll @@
                     'branch': 'branch',
                     'book': 'bookmark',
                     'tag': 'tag',
                     'rev': 'id',
+                }
             rev_spec = "max(%s(%%s))" % _revset_predicates[ref[0]]
             revs = repo.scm_instance._repo.revs(rev_spec, safe_str(ref[1]))
             if revs:
                 rev = revs[-1]
             # else: TODO: just report 'not found'
         try:
             return repo.scm_instance.get_changeset(rev)
+            return repo.scm_instance.get_changeset(rev).raw_id
         except EmptyRepositoryError, e:
             if not redirect_after:
                 return None
             h.flash(h.literal(_('There are no changesets yet')),
                     category='warning')
             redirect(url('summary_home', repo_name=repo.repo_name))
         except RepositoryError, e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             if not partial:
                 redirect(h.url('summary_home', repo_name=repo.repo_name))
@@ @@ -210,26 +210,26 @@ class CompareController(BaseRepoControll @@
         if other_repo is None:
             log.error('Could not find other repo %s' % other_repo)
             raise HTTPNotFound
         if org_repo != other_repo and h.is_git(org_repo):
             log.error('compare of two remote repos not available for GIT REPOS')
             raise HTTPNotFound
         if org_repo.scm_instance.alias != other_repo.scm_instance.alias:
             log.error('compare of two different kind of remote repos not available')
             raise HTTPNotFound
         self.__get_cs_or_redirect(ref=org_ref, repo=org_repo, partial=partial)
         self.__get_cs_or_redirect(ref=other_ref, repo=other_repo, partial=partial)
         org_rev = self.__get_rev_or_redirect(ref=org_ref, repo=org_repo, partial=partial)
         other_rev = self.__get_rev_or_redirect(ref=other_ref, repo=other_repo, partial=partial)
         c.org_repo = org_repo
         c.other_repo = other_repo
         c.org_ref = org_ref[1]
         c.other_ref = other_ref[1]
         c.org_ref_type = org_ref[0]
         c.other_ref_type = other_ref[0]
         c.cs_ranges, c.ancestor = self._get_changesets(org_repo.scm_instance.alias,
                                                        org_repo.scm_instance, org_ref,
                                                        other_repo.scm_instance, other_ref,
                                                        merge)
@@ @@ -240,32 +240,32 @@ class CompareController(BaseRepoControll @@
             log.error('Unable to find ancestor revision')
         if partial:
             return render('compare/compare_cs.html')
         if c.ancestor:
             assert merge
             # case we want a simple diff without incoming changesets,
             # previewing what will be merged.
             # Make the diff on the other repo (which is known to have other_ref)
             log.debug('Using ancestor %s as org_ref instead of %s'
                       % (c.ancestor, org_ref))
-            org_ref = ('rev', c.ancestor)
+            org_rev = c.ancestor
             org_repo = other_repo
         diff_limit = self.cut_off_limit if not c.fulldiff else None
         log.debug('running diff between %s and %s in %s'
                   % (org_ref, other_ref, org_repo.scm_instance.path))
         txtdiff = org_repo.scm_instance.get_diff(rev1=safe_str(org_ref[1]), rev2=safe_str(other_ref[1]))
                   % (org_rev, other_rev, org_repo.scm_instance.path))
         txtdiff = org_repo.scm_instance.get_diff(rev1=org_rev, rev2=other_rev)
         diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',
                                              diff_limit=diff_limit)
         _parsed = diff_processor.prepare()
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
         c.files = []
         c.changes = {}
         c.lines_added = 0

0 comments (0 inline, 0 general)