kallithea Changeset - 3abfe76f1ac7

Changeset - 3abfe76f1ac7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-07-18 19:22:01
madski@unity3d.com

compare: give an error message when trying to compare across repositories ... and it is more of a bad request, not a 'not found'

1 file changed with 3 insertions and 1 deletions:

kallithea/controllers/compare.py

0 comments (0 inline, 0 general)

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -236,26 +236,28 @@ class CompareController(BaseRepoControll @@
         if merge and c.ancestor:
             # 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_rev)
             log.debug('Using ancestor %s as rev1 instead of %s'
                       % (c.ancestor, c.org_rev))
             rev1 = c.ancestor
             org_repo = other_repo
         else: # comparing tips, not necessarily linearly related
             if merge:
                 log.error('Unable to find ancestor revision')
             if org_repo != other_repo:
                 # TODO: we could do this by using hg unionrepo
                 log.error('cannot compare across repos %s and %s', org_repo, other_repo)
                 raise HTTPNotFound
                 h.flash(_('Cannot compare repositories without using common ancestor'), category='error')
                 raise HTTPBadRequest
             rev1 = c.org_rev
         diff_limit = self.cut_off_limit if not c.fulldiff else None
         log.debug('running diff between %s and %s in %s'
                   % (rev1, c.other_rev, org_repo.scm_instance.path))
         txtdiff = org_repo.scm_instance.get_diff(rev1=rev1, rev2=c.other_rev,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
         diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',
                                              diff_limit=diff_limit)

0 comments (0 inline, 0 general)