# HG changeset patch # User Mads Kiilerich # Date 1442364872 -7200 # Node ID 41fe196eeaf560c8c66b70664c55c61f69f1959d # Parent 9416093966a0b929afb9a80645a4f2de8be32c50 pull requests: fix incorrect display of pull requests without updates avail_revs would contain the top revision and thus not be empty even though no revs were available for update. diff -r 9416093966a0 -r 41fe196eeaf5 kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py Wed Sep 16 02:54:32 2015 +0200 +++ b/kallithea/controllers/pullrequests.py Wed Sep 16 02:54:32 2015 +0200 @@ -615,10 +615,11 @@ c.update_msg = _('This pull request can be updated with changes on %s:') % c.cs_branch_name else: show = set() + avail_revs = set() # drop revs[0] c.update_msg = _('No changesets found for updating this pull request.') # TODO: handle branch heads that not are tip-most - brevs = org_scm_instance._repo.revs('%s - %ld', c.cs_branch_name, avail_revs) + brevs = org_scm_instance._repo.revs('%s - %ld - %s', c.cs_branch_name, avail_revs, revs[0]) if brevs: # also show changesets that are on branch but neither ancestors nor descendants show.update(org_scm_instance._repo.revs('::%ld - ::%ld - ::%s', brevs, avail_revs, c.a_branch_name))