Add filtering commits by branch

app.py

@@ -979,8 +979,9 @@ def repositoryBranches(username, repository):

                                
                                
                                
                            
                                
                                    
                                        
                                            979  
                                                )
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            980  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            981  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        982 -
                                        @repositories.route("/<username>/<repository>/log/")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        983 -
                                        def repositoryLog(username, repository):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        982 +
                                        @repositories.route("/<username>/<repository>/log/", defaults={"branch": None})
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        983 +
                                        @repositories.route("/<username>/<repository>/log/<branch>/")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        984 +
                                        def repositoryLog(username, repository, branch):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            985  
                                                if not (getVisibility(username, repository) or getPermissionLevel(flask.session.get("username"), username,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            986  
                                                                                                                  repository) is not None):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            987  
                                                    flask.abort(403)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -995,12 +996,48 @@ def repositoryLog(username, repository):

                                
                                
                                
                            
                                
                                    
                                        
                                            996  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            997  
                                                repo = git.Repo(serverRepoLocation)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            998  
                                                repoData = Repo.query.filter_by(route=f"/{username}/{repository}").first()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        998 -
                                            commits = Commit.query.filter_by(repo=repoData)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        999 +
                                            if not repoData.defaultBranch:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1000 +
                                                if repo.heads:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1001 +
                                                    repoData.defaultBranch = repo.heads[0].name
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1002 +
                                                else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1003 +
                                                    return flask.render_template("empty.html",
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1004 +
                                                                                 remote=f"http{'s' if config.suggestHTTPS else ''}://{config.BASE_DOMAIN}/git/{username}/{repository}"), 200
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1005 +
                                            if not branch:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1006 +
                                                branch = repoData.defaultBranch
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1007 +
                                                return flask.redirect(f"./{branch}", code=302)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1008 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1009 +
                                            if branch.startswith("tag:"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1010 +
                                                ref = f"tags/{branch[4:]}"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1011 +
                                            elif branch.startswith("~"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1012 +
                                                ref = branch[1:]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1013 +
                                            else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1014 +
                                                ref = f"heads/{branch}"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1015 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1016 +
                                            ref = ref.replace("~", "/")  # encode slashes for URL support
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1017 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1018 +
                                            try:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1019 +
                                                repo.git.checkout("-f", ref)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1020 +
                                            except git.exc.GitCommandError:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1021 +
                                                return flask.render_template("not-found.html"), 404
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1022 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1023 +
                                            branches = repo.heads
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1024 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1025 +
                                            allRefs = []
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1026 +
                                            for ref in repo.heads:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1027 +
                                                allRefs.append((ref, "head"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1028 +
                                            for ref in repo.tags:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1029 +
                                                allRefs.append((ref, "tag"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1030 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1031 +
                                            commitList = [f"/{username}/{repository}/{sha}" for sha in gitCommand(serverRepoLocation, None, "log", "--format='%H'").decode().split("\n")]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1032 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1033 +
                                            commits = Commit.query.filter(Commit.identifier.in_(commitList))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1034  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1035  
                                                return flask.render_template(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1036  
                                                        "repo-log.html",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1037  
                                                        username=username,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1038  
                                                        repository=repository,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1039 +
                                                    branches=allRefs,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1040 +
                                                    current=branch,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1041  
                                                        repoData=repoData,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1042  
                                                        repo=repo,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1043  
                                                        commits=commits,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/repository/repo-log.html

@@ -6,6 +6,43 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                                <x-vbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                                    <x-frame style="--width: 896px;" class="flexible-space">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                                        <x-vbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        9 +
                                                        <select id="branch-selection" style="flex: 0 1 auto;">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        10 +
                                                            <option value="ref-{{ current }}" selected>{% if "tag:" in current %}tag:{% endif %}{{ current | replace("~", "/") | replace("tag:", " ") }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        11 +
                                                            {% for branch in branches %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 +
                                                                {% if branch[0] != current | replace("~", "/") | replace("tag:", " ") %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        13 +
                                                                    <option value="ref-{% if branch[1] == 'tag' %}tag:{% endif %}{{ branch[0] | replace('/', '~') }}">{% if branch[1] == "tag" %}tag: {% endif %}{{ branch[0] }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        14 +
                                                                {% endif %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        15 +
                                                            {% endfor %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        16 +
                                                            <!--<option value="new">[CREATE NEW BRANCH]</option>-->
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                        </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                                        <script>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        19 +
                                                            branchSelect = document.getElementById("branch-selection");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        20 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        21 +
                                                            branchSelect.addEventListener("change", function() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        22 +
                                                                if(branchSelect.value == "new") {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        23 +
                                                                    document.getElementById("new-branch").showModal();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        24 +
                                                                } else {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        25 +
                                                                    const PREFIX = "ref-";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        26 +
                                                                    if(branchSelect.value.startsWith(PREFIX)) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        27 +
                                                                        branch = branchSelect.value.slice(PREFIX.length);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        28 +
                                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        29 +
                                                                    var http = new XMLHttpRequest();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        30 +
                                                                    http.open("HEAD", "/{{ username }}/{{ repository }}/log/" + branch + "/{{ subpath }}", false);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        31 +
                                                                    http.send();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        32 +
                                                                    if(http.status == 404) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        33 +
                                                                        location.href = "/{{ username }}/{{ repository }}/log/" + branch;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        34 +
                                                                    } else {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        35 +
                                                                        location.href = "/{{ username }}/{{ repository }}/log/" + branch + "/{{ subpath }}";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        36 +
                                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        37 +
                                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        38 +
                                                            });
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        39 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        40 +
                                                            path = document.getElementById("repo-path-bar");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 +
                                                            path.addEventListener("change", function() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 +
                                                                location.href = "/{{ username }}/{{ repository }}/log/{{ current }}" + path.value;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        44 +
                                                            });
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        45 +
                                                        </script>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            46  
                                                            {% for commit in commits | reverse %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            47  
                                                                <article class="card card-horizontal">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            48  
                                                                    <figure class="branch-icon">