From 87ba702e0f0d63a819d8e02021fb018bb5dc7647 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 13 2014 07:14:48 +0000
Subject: Rename the request DB object to pull_request to not conflict with the flask request object


---

diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html
index 0c3d7dd..fe594a0 100644
--- a/progit/templates/pull_request.html
+++ b/progit/templates/pull_request.html
@@ -18,9 +18,9 @@
 
 </h2>
 
-{% if request %}
-<h3>Title: {{ request.title }}</h3>
-  {% if request.status and repo_admin %}
+{% if pull_request %}
+<h3>Title: {{ pull_request.title }}</h3>
+  {% if pull_request.status and repo_admin %}
   <div class="pr_actions">
     <form action="{{ url_for('merge_request_pull', username=username,
         repo=repo.name, requestid=requestid) }}" method="POST">
@@ -33,7 +33,7 @@
         <input type="submit" value="Cancel" id="cancel_pr"/>
     </form>
   </div>
-  {% elif request and request.status == False %}
+  {% elif pull_request and pull_request.status == False %}
   <span class="error">Merged</span>
   {% endif %}
 {% endif %}
@@ -42,9 +42,9 @@
   <ul>
     {% for commit in diff_commits %}
     <li>
-    {% if request and request.status and request.repo_from.is_fork %}
-      <a href="{{ url_for('view_commit', username=request.repo_from.user.user,
-                  repo=request.repo_from.name, commitid=commit.oid.hex)}}">
+    {% if pull_request and pull_request.status and pull_request.repo_from.is_fork %}
+      <a href="{{ url_for('view_commit', username=pull_request.repo_from.user.user,
+                  repo=pull_request.repo_from.name, commitid=commit.oid.hex)}}">
     {% else %}
       <a href="{{ url_for('view_commit', username=username,
                   repo=repo.name, commitid=commit.oid.hex)}}">
@@ -122,7 +122,7 @@
     {{ diff_commits[loop.index - 1].message }}
     </p>
     {% autoescape false %}
-        {{ html_diff | format_loc(diff_commits[loop.index - 1], request,
+        {{ html_diff | format_loc(diff_commits[loop.index - 1], pull_request,
             index=loop.index) }}
     {% endautoescape %}
   {% endfor %}
diff --git a/progit/ui/fork.py b/progit/ui/fork.py
index cbd84bb..ed493fe 100644
--- a/progit/ui/fork.py
+++ b/progit/ui/fork.py
@@ -147,7 +147,7 @@ def request_pull(repo, requestid, username=None):
         requestid=requestid,
         repo=repo,
         username=username,
-        request=request,
+        pull_request=request,
         repo_admin=is_repo_admin(request.repo),
         repo_obj=repo_obj,
         orig_repo=orig_repo,