Mercurial > kallithea

comparison rhodecode/controllers/pullrequests.py @ 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 eb180eb16c18
children 32471bd1f4ee
comparison
equal deleted inserted replaced
2932:19ea3e16f65b 2933:07d620f6db2e
147 'description': fork.description, 147 'description': fork.description,
148 'revs': h.select('other_ref', '', 148 'revs': h.select('other_ref', '',
149 self._get_repo_refs(fork.scm_instance), 149 self._get_repo_refs(fork.scm_instance),
150 class_='refs') 150 class_='refs')
151 } 151 }
152 #add parents of this fork also 152 #add parents of this fork also, but only if it's not empty
153 if org_repo.parent: 153 if org_repo.parent and org_repo.parent.scm_instance.revisions:
154 c.default_pull_request = org_repo.parent.repo_name 154 c.default_pull_request = org_repo.parent.repo_name
155 c.default_pull_request_rev = self._get_default_rev(org_repo.parent) 155 c.default_pull_request_rev = self._get_default_rev(org_repo.parent)
156 c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance) 156 c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)
157 c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % ( 157 c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
158 org_repo.parent.user.username, 158 org_repo.parent.user.username,