From 2c55b65e1f77cc6bbb11556e10fd90bfeb3442e1 Mon Sep 17 00:00:00 2001
From: zPlus <zplus@peers.community>
Date: Sun, 31 Jul 2022 17:18:01 +0200
Subject: [PATCH] Fix broken branch selectors in "tree" and "log" pages.

- Select the correct revision in the <select> menu when loading the page
- In the "log" page, redirect to the log page again instead of the tree
  page
---
 templates/repository/log.html  |  8 +++++---
 templates/repository/tree.html |  6 ++++--
 web.py                         | 16 +++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/templates/repository/log.html b/templates/repository/log.html
index 83a0ec6..aa84bf8 100644
--- a/templates/repository/log.html
+++ b/templates/repository/log.html
@@ -5,12 +5,13 @@
 {% block content %}
 
     <div>
-        <form action="{{ url('tree_change', repository=repository[:-4]) }}" method="post">
+        <form action="{{ url('log_change', repository=repository[:-4]) }}" method="post">
             <select name="revision" id="revision">
                 <optgroup label="heads">
                     {% for h in heads %}
                         <option value="{{ h[11:] }}"
-                                {{ "selected" if h[11:] == repository[2] }}
+                                {{ "selected" if h[11:] == revision }}
+                                {{ "selected" if revision == "HEAD" and head_ref == h }}
                         >{{ h[11:] }}{{ ' [HEAD]' if head_ref == h }}</option>
                     {% endfor %}
                 </optgroup>
@@ -18,7 +19,8 @@
                 <optgroup label="tags">
                     {% for t in tags %}
                         <option value="{{ t[10:] }}"
-                                {{ "selected" if t[10:] == repository[2] }}
+                                {{ "selected" if t[10:] == revision }}
+                                {{ "selected" if revision == "HEAD" and head_ref == h }}
                         >{{ t[10:] }}</option>
                     {% endfor %}
                 </optgroup>
diff --git a/templates/repository/tree.html b/templates/repository/tree.html
index 7679756..8a9063d 100644
--- a/templates/repository/tree.html
+++ b/templates/repository/tree.html
@@ -10,7 +10,8 @@
                 <optgroup label="heads">
                     {% for h in heads %}
                         <option value="{{ h[11:] }}"
-                                {{ "selected" if h[11:] == repository[2] }}
+                                {{ "selected" if h[11:] == revision }}
+                                {{ "selected" if revision == "HEAD" and head_ref == h }}
                         >{{ h[11:] }}{{ ' [HEAD]' if head_ref == h }}</option>
                     {% endfor %}
                 </optgroup>
@@ -18,7 +19,8 @@
                 <optgroup label="tags">
                     {% for t in tags %}
                         <option value="{{ t[10:] }}"
-                                {{ "selected" if t[10:] == repository[2] }}
+                                {{ "selected" if t[10:] == revision }}
+                                {{ "selected" if revision == "HEAD" and head_ref == h }}
                         >{{ t[10:] }}</option>
                     {% endfor %}
                 </optgroup>
diff --git a/web.py b/web.py
index eb81bac..719bde6 100644
--- a/web.py
+++ b/web.py
@@ -398,7 +398,7 @@ def tree(repository, revision, tree_path=None):
 def tree_change(repository):
     """
     Switch revision in tree page.
-    This route is used by the <form> in the "tree page when changing the revision
+    This route is used by the <form> in the tree page when changing the revision
     to be displayed.
     """
     
@@ -474,6 +474,20 @@ def log(repository, revision):
         commits=commits,
         repository=repository, revision=revision)
 
+@bottle.post('/<repository:path>.git/log', name='log_change')
+def log_change(repository):
+    """
+    Switch revision in log page.
+    This route is used by the <form> in the log page when changing the revision
+    to be displayed.
+    """
+    
+    revision = request.forms.get('revision')
+    
+    bottle.redirect(application.get_url('log',
+                                        repository=repository,
+                                        revision=revision))
+
 @bottle.get('/<repository:path>.git/raw/<revision>/<tree_path:path>', name='raw')
 def raw(repository, revision, tree_path):
     """