From 3e1439e114a6fca9c77a9a0de573ea8a0d6e6457 Mon Sep 17 00:00:00 2001
From: farhaanbukhsh <farhaan.bukhsh@gmail.com>
Date: Aug 31 2016 09:23:35 +0000
Subject: Fix the new changes to be used in 'lib' and other files


---

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 5f875d4..7457766 100644
--- a/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py
+++ b/alembic/versions/1d18843a1994_add_is_fork_column_to_projects.py
@@ -20,7 +20,7 @@ def upgrade():
     op.add_column(
         'projects',
         sa.Column(
-            '__is_fork', sa.Boolean,
+            '_is_fork', sa.Boolean,
             default=False,
             nullable=True)
     )
diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py
index 6ac1b29..b8d0801 100644
--- a/pagure/internal/__init__.py
+++ b/pagure/internal/__init__.py
@@ -273,7 +273,7 @@ def get_pull_request_ready_branch():
         branch = repo_obj.lookup_branch(branchname)
 
         diff_commits = []
-        if repo.is_fork:
+        if repo.is_fork and repo.parent:
             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 bbe7ec3..596d5c8 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)
     )
 
@@ -1543,11 +1543,11 @@ def search_projects(
     if fork is not None:
         if fork is True:
             projects = projects.filter(
-                model.Project._is_fork == True
+                model.Project.is_fork == True
             )
         elif fork is False:
             projects = projects.filter(
-                model.Project._is_fork == False
+                model.Project.is_fork == False
             )
 
     if tags:
@@ -1616,11 +1616,11 @@ def get_project(session, name, user=None):
         ).filter(
             model.User.id == model.Project.user_id
         ).filter(
-            model.Project._is_fork == True
+            model.Project.is_fork == True
         )
     else:
         query = query.filter(
-            model.Project._is_fork == False
+            model.Project.is_fork == False
         )
 
     return query.first()
@@ -2940,11 +2940,11 @@ def is_watching(session, user, reponame, repouser=None):
         ).filter(
             model.User.id == model.Project.user_id
         ).filter(
-            model.Project._is_fork == True
+            model.Project.is_fork == True
         )
     else:
         query = query.filter(
-            model.Project._is_fork == False
+            model.Project.is_fork == False
         )
 
     watcher = query.first()