PR merging

roundabout,
created on Thursday, 1 February 2024, 15:12:23 (1706800343), received on Wednesday, 31 July 2024, 06:54:41 (1722408881)
Author identity: vlad <vlad.muntoiu@gmail.com>

                                
                                
                                
                            
                                
                                    
                                        
                                            932  
                                                else:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            933  
                                                    repo_data = Repo.query.filter_by(route=f"/{username}/{repository}").first()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            934  
                                                    head = flask.request.form.get("head")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        935 +
                                                head_route = flask.request.form.get("headroute")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            936  
                                                    base = flask.request.form.get("base")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        937 +
                                                base_route = flask.request.form.get("baseroute")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            938  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        937 -
                                                if not head and base:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        938 -
                                                    flask.abort(400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        939 +
                                                if not head and base and head_route and base_route:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        940 +
                                                    return flask.redirect(".", 400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        941 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        942 +
                                                head_repo = git.Repo(os.path.join(server_repo_location, head_route.lstrip("/")))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        943 +
                                                base_repo = git.Repo(os.path.join(server_repo_location, base_route.lstrip("/")))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        944 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        945 +
                                                if head not in head_repo or base not in base_repo:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        946 +
                                                    flask.flash(Markup(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        947 +
                                                            "<iconify-icon icon='mdi:error'></iconify-icon>Bad branch name"),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        948 +
                                                            category="error")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        949 +
                                                    return flask.redirect(".", 400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        950 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        951 +
                                                head_data = db.session.get(Repo, head_repo)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        952 +
                                                if head_data.visibility != 1:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        953 +
                                                    flask.flash(Markup(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        954 +
                                                            "<iconify-icon icon='mdi:error'></iconify-icon>Head can't be restricted"),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        955 +
                                                            category="error")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        956 +
                                                    return flask.redirect(".", 400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            957  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            958  
                                                    pull_request = PullRequest(repo_data, head, repo_data, base, db.session.get(User, flask.session["username"]))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            959  
                                                    db.session.add(pull_request)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                                    <x-frame style="--width: 896px;" class="flexible-space">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            9  
                                                        <form method="post">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            10  
                                                            <x-hbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        11 -
                                                            <select name="head" style="flex: 0 1 auto;" required>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 -
                                                                <option value="" selected>===Head branch===</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        13 -
                                                                {% for branch in branches %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        14 -
                                                                    <option value="{{ branch }}">{{ branch }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        15 -
                                                                {% endfor %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        16 -
                                                            </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        11 +
                                                            <input name="headroute" value="{{ repo_data.route }}" required>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 +
                                                            <input name="head" style="flex: 0 1 auto;" required placeholder="Head branch">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            13  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            14  
                                                                <iconify-icon icon="mdi-light:arrow-right" style="font-size: 2em;"></iconify-icon>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            15  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            16  
                                                                <select name="base" style="flex: 0 1 auto;" required>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        21 -
                                                                <option value="" selected>===Base branch===</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                                <option value="" selected>Base branch</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            18  
                                                                    {% for branch in branches %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            19  
                                                                        <option value="{{ branch }}">{{ branch }}</option>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            20  
                                                                    {% endfor %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            21  
                                                                </select>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        26 -
                                                            <button type="submit">Send PR</button>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        22 +
                                                            <button type="submit">Request merging</button>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            23  
                                                            </x-hbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                                        </form>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            25  
                                                    </x-frame>