Mercurial > kallithea

changeset 2933:07d620f6db2e beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull requests throw an error if parent of fork didn't have any changesets yet. Now it's filter out from list of available sources
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 17 Oct 2012 21:34:52 +0200
parents 19ea3e16f65b
children 7d86b61b152a
files rhodecode/controllers/pullrequests.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py	Wed Oct 17 21:27:46 2012 +0200
+++ b/rhodecode/controllers/pullrequests.py	Wed Oct 17 21:34:52 2012 +0200
@@ -149,8 +149,8 @@
                                  self._get_repo_refs(fork.scm_instance),
                                  class_='refs')
             }
-        #add parents of this fork also
-        if org_repo.parent:
+        #add parents of this fork also, but only if it's not empty
+        if org_repo.parent and org_repo.parent.scm_instance.revisions:
             c.default_pull_request = org_repo.parent.repo_name
             c.default_pull_request_rev = self._get_default_rev(org_repo.parent)
             c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)