From 778e695bd37b1e3a1ccda6041348a0e48e54a109 Mon Sep 17 00:00:00 2001 From: farhaanbukhsh Date: Aug 31 2016 09:23:35 +0000 Subject: Fix avoid making Pr and Pep8 convention --- diff --git a/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py b/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py index 7457766..d10f299 100644 --- a/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py +++ b/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py @@ -20,19 +20,18 @@ def upgrade(): op.add_column( 'projects', sa.Column( - '_is_fork', sa.Boolean, + 'is_fork', sa.Boolean, default=False, nullable=True) ) op.execute('''UPDATE "projects" ''' - '''SET _is_fork=TRUE WHERE parent_id IS NOT NULL;''') + '''SET is_fork=TRUE WHERE parent_id IS NOT NULL;''') op.execute('''UPDATE "projects" ''' - '''SET _is_fork=FALSE WHERE parent_id IS NULL;''') + '''SET is_fork=FALSE WHERE parent_id IS NULL;''') op.alter_column( - 'projects', - column_name='_is_fork', new_column_name='is_fork', + 'projects', 'is_fork', nullable=False, existing_nullable=True) def downgrade(): diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index b8d0801..3f13ed8 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -273,7 +273,11 @@ def get_pull_request_ready_branch(): branch = repo_obj.lookup_branch(branchname) diff_commits = [] - if repo.is_fork and repo.parent: + + if repo.is_fork and not repo.parent: + return None + + if repo.is_fork: parentpath = os.path.join( pagure.APP.config['GIT_FOLDER'], repo.parent.path) if repo.parent.is_fork: diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 596d5c8..1f22ace 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -1412,7 +1412,7 @@ def fork_project(session, user, repo, gitfolder, description=repo.description, user_id=user_obj.id, parent_id=repo.id, - is_fork = True, + is_fork=True, hook_token=pagure.lib.login.id_generator(40) ) diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index d3f431d..58816c2 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -198,7 +198,7 @@ def view_repo_branch(repo, branchname, username=None): diff_commits = [] - if repo.is_fork: + if repo.is_fork and repo.parent: parentname = os.path.join( APP.config['GIT_FOLDER'], repo.parent.path) else: