kallithea Changeset - 48142e84bdc8

Changeset - 48142e84bdc8

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: only warn about missing ancestor if a 'merge' diff was requested

1 file changed with 2 insertions and 2 deletions:

rhodecode/controllers/compare.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -213,26 +213,26 @@ class CompareController(BaseRepoControll @@
         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)
         c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
                                                    c.cs_ranges])
         if not c.ancestor:
             log.warning('Unable to find ancestor revision')
         if merge and not c.ancestor:
             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)

0 comments (0 inline, 0 general)