Mercurial > kallithea
changeset 4040:d415621fa7c5
compare: handle revisions and ancestor of empty range in _get_changesets
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 26 Jun 2013 00:20:17 +0200 |
parents | b44fabc4377c |
children | 15f4825890fe |
files | rhodecode/controllers/compare.py |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py Wed Jun 26 00:13:15 2013 +0200 +++ b/rhodecode/controllers/compare.py Wed Jun 26 00:20:17 2013 +0200 @@ -110,7 +110,12 @@ ancestor = None - if alias == 'hg': + if org_rev == other_rev: + changesets = [] + if merge: + ancestor = org_rev + + elif alias == 'hg': # lookup up the exact node id _revset_predicates = { 'branch': 'branch',