From c24b33c6b4b6005711545a7f3003b288ea8d974d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 22 2017 08:36:57 +0000
Subject: [PATCH 1/3] Fix showing the file names in PR (pre)view


Fixes https://pagure.io/pagure/issue/2266

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 800b175..63442c2 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -450,15 +450,20 @@
                 {%- endif -%}
               {%- elif patch | hasattr('delta') -%}
                 {%- if patch.delta.new_file.path == patch.delta.old_file.path -%}
-                  {%- if patch.delta.new_file.mode == 0 and patch.delta.old_file.mode == 33188 -%}
+                  {%- if patch.delta.new_file.mode == 0
+                      and patch.delta.old_file.mode in [33188, 33261] -%}
                     {% set patchtype = "removed"%}
                     <div class="clearfix">{{viewfilelink(patch.delta.new_file.path)}} {{lineschanged(False, True)}}</div>
                     <div><small>file removed</small></div>
-                  {%-elif patch.delta.new_file.mode == 33188 and patch.delta.old_file.mode == 0 -%}
+
+                  {%-elif patch.delta.new_file.mode in [33188, 33261]
+                      and patch.delta.old_file.mode == 0 -%}
                     {% set patchtype = "added"%}
                     <div class="clearfix">{{viewfilelink(patch.delta.new_file.path)}} {{lineschanged(True, False)}}</div>
                     <div><small>file added</small></div>
-                  {%-elif patch.delta.new_file.mode == 33188 and patch.delta.old_file.mode == 33188 -%}
+
+                  {%-elif patch.delta.new_file.mode in [33188, 33261]
+                      and patch.delta.old_file.mode in [33188, 33261] -%}
                     {% set patchtype = "changed"%}
                     <div class="clearfix">
                       {{ viewfilelink(patch.delta.new_file.path)}} {{lineschanged(True, True)}}

From ddcf43ddb8b97236619cba526ec10c7b9d53fc7b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 22 2017 08:36:57 +0000
Subject: [PATCH 2/3] Some indentation fixes


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 63442c2..fa4cede 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -389,11 +389,11 @@
               {%endmacro%}
 
               {% macro viewfilelink(filepath, identifier=False)%}
-              {% if pull_request %}
-              {% if not identifier %}
-                {% set identifier = pull_request.branch_from %}
-              {% endif %}
-              <a href="{{
+                {% if pull_request %}
+                {% if not identifier %}
+                  {% set identifier = pull_request.branch_from %}
+                {% endif %}
+                <a href="{{
                   url_for(
                       'view_file',
                       repo=pull_request.project_from.name,
@@ -402,11 +402,11 @@
                       namespace=pull_request.project_from.namespace,
                       identifier=identifier,
                       filename=filepath) }}"
-              {% else %}
-              {% if identifier == False %}
-                {% set identifier = branch_from %}
-              {% endif %}
-              <a href="{{
+                {% else %}
+                {% if identifier == False %}
+                  {% set identifier = branch_from %}
+                {% endif %}
+                <a href="{{
                   url_for(
                       'view_file',
                       repo=repo.name,
@@ -414,8 +414,9 @@
                       namespace=repo.namespace,
                       identifier=identifier,
                       filename=filepath) }}"
-              {% endif %}
-              title="View file as of {{ patch_new_id|short }}">{{filepath | unicode}}</a>
+                {% endif %}
+                title="View file as of {{ patch_new_id|short }}">
+                  {{filepath | unicode}}</a>
               {% endmacro %}
 
               {% if patch | hasattr('new_file_path') %}

From f3d542b3c14adbe0b9bde8b01fa8ea715708de37 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 22 2017 08:36:58 +0000
Subject: [PATCH 3/3] Some more style changes


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index fa4cede..89d01f8 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -369,6 +369,7 @@
       <div class="card clearfix" id="_{{count}}">
         <div class="card-header">
             <h5>
+
               {% if patch | hasattr('additions') %}
               {# Version of pygit2 -0.21.4 -- F21/EL7 #}
                   {% set linesadded = patch.additions %}
@@ -454,23 +455,31 @@
                   {%- if patch.delta.new_file.mode == 0
                       and patch.delta.old_file.mode in [33188, 33261] -%}
                     {% set patchtype = "removed"%}
-                    <div class="clearfix">{{viewfilelink(patch.delta.new_file.path)}} {{lineschanged(False, True)}}</div>
+                    <div class="clearfix">
+                      {{ viewfilelink(patch.delta.new_file.path) }}
+                      {{ lineschanged(False, True) }}
+                    </div>
                     <div><small>file removed</small></div>
 
                   {%-elif patch.delta.new_file.mode in [33188, 33261]
                       and patch.delta.old_file.mode == 0 -%}
                     {% set patchtype = "added"%}
-                    <div class="clearfix">{{viewfilelink(patch.delta.new_file.path)}} {{lineschanged(True, False)}}</div>
+                    <div class="clearfix">
+                      {{ viewfilelink(patch.delta.new_file.path) }}
+                      {{ lineschanged(True, False) }}
+                    </div>
                     <div><small>file added</small></div>
 
                   {%-elif patch.delta.new_file.mode in [33188, 33261]
                       and patch.delta.old_file.mode in [33188, 33261] -%}
                     {% set patchtype = "changed"%}
                     <div class="clearfix">
-                      {{ viewfilelink(patch.delta.new_file.path)}} {{lineschanged(True, True)}}
+                      {{ viewfilelink(patch.delta.new_file.path)}}
+                      {{ lineschanged(True, True) }}
                     </div>
                     <div><small>file changed</small></div>
                   {%-endif-%}
+
                 {%- else -%}
                   {% set patchtype = "moved"%}
                   {{lineschanged(True, True)}}