577 lines
44 KiB
HTML
577 lines
44 KiB
HTML
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Source of the Rust file `src/page.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>page.rs - source</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" type="text/css" href="../../normalize.css"><link rel="stylesheet" type="text/css" href="../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../ayu.css" disabled><link rel="stylesheet" type="text/css" href="../../dark.css" disabled><link rel="stylesheet" type="text/css" href="../../light.css" id="themeStyle"><script id="default-settings" ></script><script src="../../storage.js"></script><script defer src="../../source-script.js"></script><script defer src="../../source-files.js"></script><script defer src="../../main.js"></script><noscript><link rel="stylesheet" href="../../noscript.css"></noscript><link rel="alternate icon" type="image/png" href="../../favicon-16x16.png"><link rel="alternate icon" type="image/png" href="../../favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="../../favicon.svg"></head><body class="rustdoc source"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle">☰</button><a class="sidebar-logo" href="../../pages/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div>
|
||
</a><h2 class="location"></h2>
|
||
</nav>
|
||
<nav class="sidebar"><a class="sidebar-logo" href="../../pages/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div>
|
||
</a></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../pages/index.html"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></a><nav class="sub"><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><div id="settings-menu" tabindex="-1">
|
||
<a href="../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../wheel.svg"></a></div>
|
||
</div></form></nav></div><section id="main-content" class="content"><div class="example-wrap"><pre class="line-numbers"><span id="1">1</span>
|
||
<span id="2">2</span>
|
||
<span id="3">3</span>
|
||
<span id="4">4</span>
|
||
<span id="5">5</span>
|
||
<span id="6">6</span>
|
||
<span id="7">7</span>
|
||
<span id="8">8</span>
|
||
<span id="9">9</span>
|
||
<span id="10">10</span>
|
||
<span id="11">11</span>
|
||
<span id="12">12</span>
|
||
<span id="13">13</span>
|
||
<span id="14">14</span>
|
||
<span id="15">15</span>
|
||
<span id="16">16</span>
|
||
<span id="17">17</span>
|
||
<span id="18">18</span>
|
||
<span id="19">19</span>
|
||
<span id="20">20</span>
|
||
<span id="21">21</span>
|
||
<span id="22">22</span>
|
||
<span id="23">23</span>
|
||
<span id="24">24</span>
|
||
<span id="25">25</span>
|
||
<span id="26">26</span>
|
||
<span id="27">27</span>
|
||
<span id="28">28</span>
|
||
<span id="29">29</span>
|
||
<span id="30">30</span>
|
||
<span id="31">31</span>
|
||
<span id="32">32</span>
|
||
<span id="33">33</span>
|
||
<span id="34">34</span>
|
||
<span id="35">35</span>
|
||
<span id="36">36</span>
|
||
<span id="37">37</span>
|
||
<span id="38">38</span>
|
||
<span id="39">39</span>
|
||
<span id="40">40</span>
|
||
<span id="41">41</span>
|
||
<span id="42">42</span>
|
||
<span id="43">43</span>
|
||
<span id="44">44</span>
|
||
<span id="45">45</span>
|
||
<span id="46">46</span>
|
||
<span id="47">47</span>
|
||
<span id="48">48</span>
|
||
<span id="49">49</span>
|
||
<span id="50">50</span>
|
||
<span id="51">51</span>
|
||
<span id="52">52</span>
|
||
<span id="53">53</span>
|
||
<span id="54">54</span>
|
||
<span id="55">55</span>
|
||
<span id="56">56</span>
|
||
<span id="57">57</span>
|
||
<span id="58">58</span>
|
||
<span id="59">59</span>
|
||
<span id="60">60</span>
|
||
<span id="61">61</span>
|
||
<span id="62">62</span>
|
||
<span id="63">63</span>
|
||
<span id="64">64</span>
|
||
<span id="65">65</span>
|
||
<span id="66">66</span>
|
||
<span id="67">67</span>
|
||
<span id="68">68</span>
|
||
<span id="69">69</span>
|
||
<span id="70">70</span>
|
||
<span id="71">71</span>
|
||
<span id="72">72</span>
|
||
<span id="73">73</span>
|
||
<span id="74">74</span>
|
||
<span id="75">75</span>
|
||
<span id="76">76</span>
|
||
<span id="77">77</span>
|
||
<span id="78">78</span>
|
||
<span id="79">79</span>
|
||
<span id="80">80</span>
|
||
<span id="81">81</span>
|
||
<span id="82">82</span>
|
||
<span id="83">83</span>
|
||
<span id="84">84</span>
|
||
<span id="85">85</span>
|
||
<span id="86">86</span>
|
||
<span id="87">87</span>
|
||
<span id="88">88</span>
|
||
<span id="89">89</span>
|
||
<span id="90">90</span>
|
||
<span id="91">91</span>
|
||
<span id="92">92</span>
|
||
<span id="93">93</span>
|
||
<span id="94">94</span>
|
||
<span id="95">95</span>
|
||
<span id="96">96</span>
|
||
<span id="97">97</span>
|
||
<span id="98">98</span>
|
||
<span id="99">99</span>
|
||
<span id="100">100</span>
|
||
<span id="101">101</span>
|
||
<span id="102">102</span>
|
||
<span id="103">103</span>
|
||
<span id="104">104</span>
|
||
<span id="105">105</span>
|
||
<span id="106">106</span>
|
||
<span id="107">107</span>
|
||
<span id="108">108</span>
|
||
<span id="109">109</span>
|
||
<span id="110">110</span>
|
||
<span id="111">111</span>
|
||
<span id="112">112</span>
|
||
<span id="113">113</span>
|
||
<span id="114">114</span>
|
||
<span id="115">115</span>
|
||
<span id="116">116</span>
|
||
<span id="117">117</span>
|
||
<span id="118">118</span>
|
||
<span id="119">119</span>
|
||
<span id="120">120</span>
|
||
<span id="121">121</span>
|
||
<span id="122">122</span>
|
||
<span id="123">123</span>
|
||
<span id="124">124</span>
|
||
<span id="125">125</span>
|
||
<span id="126">126</span>
|
||
<span id="127">127</span>
|
||
<span id="128">128</span>
|
||
<span id="129">129</span>
|
||
<span id="130">130</span>
|
||
<span id="131">131</span>
|
||
<span id="132">132</span>
|
||
<span id="133">133</span>
|
||
<span id="134">134</span>
|
||
<span id="135">135</span>
|
||
<span id="136">136</span>
|
||
<span id="137">137</span>
|
||
<span id="138">138</span>
|
||
<span id="139">139</span>
|
||
<span id="140">140</span>
|
||
<span id="141">141</span>
|
||
<span id="142">142</span>
|
||
<span id="143">143</span>
|
||
<span id="144">144</span>
|
||
<span id="145">145</span>
|
||
<span id="146">146</span>
|
||
<span id="147">147</span>
|
||
<span id="148">148</span>
|
||
<span id="149">149</span>
|
||
<span id="150">150</span>
|
||
<span id="151">151</span>
|
||
<span id="152">152</span>
|
||
<span id="153">153</span>
|
||
<span id="154">154</span>
|
||
<span id="155">155</span>
|
||
<span id="156">156</span>
|
||
<span id="157">157</span>
|
||
<span id="158">158</span>
|
||
<span id="159">159</span>
|
||
<span id="160">160</span>
|
||
<span id="161">161</span>
|
||
<span id="162">162</span>
|
||
<span id="163">163</span>
|
||
<span id="164">164</span>
|
||
<span id="165">165</span>
|
||
<span id="166">166</span>
|
||
<span id="167">167</span>
|
||
<span id="168">168</span>
|
||
<span id="169">169</span>
|
||
<span id="170">170</span>
|
||
<span id="171">171</span>
|
||
<span id="172">172</span>
|
||
<span id="173">173</span>
|
||
<span id="174">174</span>
|
||
<span id="175">175</span>
|
||
<span id="176">176</span>
|
||
<span id="177">177</span>
|
||
<span id="178">178</span>
|
||
<span id="179">179</span>
|
||
<span id="180">180</span>
|
||
<span id="181">181</span>
|
||
<span id="182">182</span>
|
||
<span id="183">183</span>
|
||
<span id="184">184</span>
|
||
<span id="185">185</span>
|
||
<span id="186">186</span>
|
||
<span id="187">187</span>
|
||
<span id="188">188</span>
|
||
<span id="189">189</span>
|
||
<span id="190">190</span>
|
||
<span id="191">191</span>
|
||
<span id="192">192</span>
|
||
<span id="193">193</span>
|
||
<span id="194">194</span>
|
||
<span id="195">195</span>
|
||
<span id="196">196</span>
|
||
<span id="197">197</span>
|
||
<span id="198">198</span>
|
||
<span id="199">199</span>
|
||
<span id="200">200</span>
|
||
<span id="201">201</span>
|
||
<span id="202">202</span>
|
||
<span id="203">203</span>
|
||
<span id="204">204</span>
|
||
<span id="205">205</span>
|
||
<span id="206">206</span>
|
||
<span id="207">207</span>
|
||
<span id="208">208</span>
|
||
<span id="209">209</span>
|
||
<span id="210">210</span>
|
||
<span id="211">211</span>
|
||
<span id="212">212</span>
|
||
<span id="213">213</span>
|
||
<span id="214">214</span>
|
||
<span id="215">215</span>
|
||
<span id="216">216</span>
|
||
<span id="217">217</span>
|
||
<span id="218">218</span>
|
||
<span id="219">219</span>
|
||
<span id="220">220</span>
|
||
<span id="221">221</span>
|
||
<span id="222">222</span>
|
||
<span id="223">223</span>
|
||
<span id="224">224</span>
|
||
<span id="225">225</span>
|
||
<span id="226">226</span>
|
||
<span id="227">227</span>
|
||
<span id="228">228</span>
|
||
<span id="229">229</span>
|
||
<span id="230">230</span>
|
||
<span id="231">231</span>
|
||
<span id="232">232</span>
|
||
<span id="233">233</span>
|
||
<span id="234">234</span>
|
||
<span id="235">235</span>
|
||
<span id="236">236</span>
|
||
<span id="237">237</span>
|
||
<span id="238">238</span>
|
||
<span id="239">239</span>
|
||
<span id="240">240</span>
|
||
<span id="241">241</span>
|
||
<span id="242">242</span>
|
||
<span id="243">243</span>
|
||
<span id="244">244</span>
|
||
<span id="245">245</span>
|
||
<span id="246">246</span>
|
||
<span id="247">247</span>
|
||
<span id="248">248</span>
|
||
<span id="249">249</span>
|
||
<span id="250">250</span>
|
||
<span id="251">251</span>
|
||
<span id="252">252</span>
|
||
<span id="253">253</span>
|
||
<span id="254">254</span>
|
||
<span id="255">255</span>
|
||
<span id="256">256</span>
|
||
<span id="257">257</span>
|
||
<span id="258">258</span>
|
||
<span id="259">259</span>
|
||
<span id="260">260</span>
|
||
<span id="261">261</span>
|
||
<span id="262">262</span>
|
||
<span id="263">263</span>
|
||
<span id="264">264</span>
|
||
<span id="265">265</span>
|
||
<span id="266">266</span>
|
||
<span id="267">267</span>
|
||
<span id="268">268</span>
|
||
<span id="269">269</span>
|
||
<span id="270">270</span>
|
||
<span id="271">271</span>
|
||
<span id="272">272</span>
|
||
<span id="273">273</span>
|
||
<span id="274">274</span>
|
||
<span id="275">275</span>
|
||
<span id="276">276</span>
|
||
<span id="277">277</span>
|
||
<span id="278">278</span>
|
||
<span id="279">279</span>
|
||
<span id="280">280</span>
|
||
<span id="281">281</span>
|
||
<span id="282">282</span>
|
||
<span id="283">283</span>
|
||
<span id="284">284</span>
|
||
</pre><pre class="rust"><code><span class="comment">/*
|
||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||
*
|
||
* This program is free software: you can redistribute it and/or modify
|
||
* it under the terms of the GNU Affero General Public License as
|
||
* published by the Free Software Foundation, either version 3 of the
|
||
* License, or (at your option) any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU Affero General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Affero General Public License
|
||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||
*/</span>
|
||
|
||
<span class="kw">use</span> <span class="ident">git2</span>::{
|
||
<span class="ident">build::CheckoutBuilder</span>, <span class="ident">Branch</span>, <span class="ident">BranchType</span>, <span class="ident">Direction</span>, <span class="ident">ObjectType</span>, <span class="ident">Oid</span>, <span class="ident">Remote</span>, <span class="ident">Repository</span>,
|
||
};
|
||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">test</span>))]</span>
|
||
<span class="kw">use</span> <span class="ident">log::info</span>;
|
||
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="self">self</span>, <span class="ident">Write</span>};
|
||
|
||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
|
||
<span class="kw">use</span> <span class="ident">std::println</span> <span class="kw">as</span> <span class="ident">info</span>;
|
||
|
||
<span class="kw">use</span> <span class="ident">serde::Deserialize</span>;
|
||
|
||
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::errors</span>::<span class="kw-2">*</span>;
|
||
|
||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>, <span class="ident">PartialEq</span>, <span class="ident">Deserialize</span>)]</span>
|
||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Page</span> {
|
||
<span class="kw">pub</span> <span class="ident">secret</span>: <span class="ident">String</span>,
|
||
<span class="kw">pub</span> <span class="ident">repo</span>: <span class="ident">String</span>,
|
||
<span class="kw">pub</span> <span class="ident">path</span>: <span class="ident">String</span>,
|
||
<span class="kw">pub</span> <span class="ident">branch</span>: <span class="ident">String</span>,
|
||
}
|
||
|
||
<span class="kw">impl</span> <span class="ident">Page</span> {
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">open_repo</span>(<span class="kw-2">&</span><span class="self">self</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">Repository</span><span class="op">></span> {
|
||
<span class="prelude-val">Ok</span>(<span class="ident">Repository::open</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">path</span>)<span class="question-mark">?</span>)
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">create_repo</span>(<span class="kw-2">&</span><span class="self">self</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">Repository</span><span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">repo</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">open_repo</span>();
|
||
|
||
<span class="kw">let</span> <span class="ident">repo</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">repo</span>) <span class="op">=</span> <span class="ident">repo</span> {
|
||
<span class="ident">repo</span>
|
||
} <span class="kw">else</span> {
|
||
<span class="macro">info!</span>(<span class="string">"Cloning repository {} at {}"</span>, <span class="self">self</span>.<span class="ident">repo</span>, <span class="self">self</span>.<span class="ident">path</span>);
|
||
<span class="ident">Repository::clone</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">repo</span>, <span class="kw-2">&</span><span class="self">self</span>.<span class="ident">path</span>)<span class="question-mark">?</span>;
|
||
<span class="ident">Repository::open</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">path</span>)<span class="question-mark">?</span>
|
||
};
|
||
|
||
<span class="self">self</span>.<span class="ident">_fetch_remote_branch</span>(<span class="kw-2">&</span><span class="ident">repo</span>, <span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>)<span class="question-mark">?</span>;
|
||
<span class="self">self</span>.<span class="ident">deploy_branch</span>(<span class="kw-2">&</span><span class="ident">repo</span>).<span class="ident">unwrap</span>();
|
||
|
||
<span class="prelude-val">Ok</span>(<span class="ident">repo</span>)
|
||
}
|
||
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">deploy_branch</span>(<span class="kw-2">&</span><span class="self">self</span>, <span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span>()<span class="op">></span> {
|
||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">checkout_options</span> <span class="op">=</span> <span class="ident">CheckoutBuilder::default</span>();
|
||
<span class="ident">checkout_options</span>
|
||
.<span class="ident">allow_conflicts</span>(<span class="bool-val">true</span>)
|
||
.<span class="ident">conflict_style_merge</span>(<span class="bool-val">true</span>)
|
||
.<span class="ident">force</span>();
|
||
|
||
<span class="kw">let</span> <span class="ident">refname</span> <span class="op">=</span> <span class="macro">format!</span>(<span class="string">"refs/heads/{}"</span>, <span class="self">self</span>.<span class="ident">branch</span>);
|
||
|
||
<span class="ident">repo</span>.<span class="ident">set_head</span>(<span class="kw-2">&</span><span class="ident">refname</span>).<span class="ident">unwrap</span>();
|
||
<span class="ident">repo</span>.<span class="ident">checkout_head</span>(<span class="prelude-val">Some</span>(<span class="kw-2">&mut</span> <span class="ident">checkout_options</span>)).<span class="ident">unwrap</span>();
|
||
|
||
<span class="macro">info!</span>(<span class="string">"Deploying branch {}"</span>, <span class="self">self</span>.<span class="ident">branch</span>);
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">fetch</span><span class="op"><</span><span class="lifetime">'a</span><span class="op">></span>(<span class="kw-2">&</span><span class="self">self</span>, <span class="ident">repo</span>: <span class="kw-2">&</span><span class="lifetime">'a</span> <span class="ident">git2::Repository</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">git2::AnnotatedCommit</span><span class="op"><</span><span class="lifetime">'a</span><span class="op">></span><span class="op">></span> {
|
||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">remote</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_remote</span>(<span class="string">"origin"</span>)<span class="question-mark">?</span>;
|
||
<span class="macro">log::info!</span>(<span class="string">"Fetching {} for repo"</span>, <span class="ident">remote</span>.<span class="ident">name</span>().<span class="ident">unwrap</span>());
|
||
<span class="ident">remote</span>.<span class="ident">fetch</span>(<span class="kw-2">&</span>[<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>], <span class="prelude-val">None</span>, <span class="prelude-val">None</span>)<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">fetch_head</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_reference</span>(<span class="string">"FETCH_HEAD"</span>)<span class="question-mark">?</span>;
|
||
<span class="prelude-val">Ok</span>(<span class="ident">repo</span>.<span class="ident">reference_to_annotated_commit</span>(<span class="kw-2">&</span><span class="ident">fetch_head</span>)<span class="question-mark">?</span>)
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">merge</span><span class="op"><</span><span class="lifetime">'a</span><span class="op">></span>(
|
||
<span class="kw-2">&</span><span class="self">self</span>,
|
||
<span class="ident">repo</span>: <span class="kw-2">&</span><span class="lifetime">'a</span> <span class="ident">Repository</span>,
|
||
<span class="ident">fetch_commit</span>: <span class="ident">git2::AnnotatedCommit</span><span class="op"><</span><span class="lifetime">'a</span><span class="op">></span>,
|
||
) -> <span class="ident">ServiceResult</span><span class="op"><</span>()<span class="op">></span> {
|
||
<span class="comment">// 1. do a merge analysis</span>
|
||
<span class="kw">let</span> <span class="ident">analysis</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">merge_analysis</span>(<span class="kw-2">&</span>[<span class="kw-2">&</span><span class="ident">fetch_commit</span>])<span class="question-mark">?</span>;
|
||
|
||
<span class="comment">// 2. Do the appropriate merge</span>
|
||
<span class="kw">if</span> <span class="ident">analysis</span>.<span class="number">0</span>.<span class="ident">is_fast_forward</span>() {
|
||
<span class="comment">//log::debug!("Doing a fast forward");</span>
|
||
<span class="macro">log::debug!</span>(<span class="string">"Doing a fast forward"</span>);
|
||
<span class="comment">// do a fast forward</span>
|
||
<span class="kw">let</span> <span class="ident">refname</span> <span class="op">=</span> <span class="macro">format!</span>(<span class="string">"refs/heads/{}"</span>, <span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>);
|
||
<span class="kw">match</span> <span class="ident">repo</span>.<span class="ident">find_reference</span>(<span class="kw-2">&</span><span class="ident">refname</span>) {
|
||
<span class="prelude-val">Ok</span>(<span class="kw-2">mut</span> <span class="ident">r</span>) => {
|
||
<span class="macro">log::debug!</span>(<span class="string">"fast forwarding"</span>);
|
||
<span class="ident"><span class="self">Self</span>::fast_forward</span>(<span class="ident">repo</span>, <span class="kw-2">&mut</span> <span class="ident">r</span>, <span class="kw-2">&</span><span class="ident">fetch_commit</span>).<span class="ident">unwrap</span>();
|
||
}
|
||
<span class="prelude-val">Err</span>(<span class="kw">_</span>) => {
|
||
<span class="comment">// The branch doesn't exist so just set the reference to the</span>
|
||
<span class="comment">// commit directly. Usually this is because you are pulling</span>
|
||
<span class="comment">// into an empty repository.</span>
|
||
<span class="macro">log::error!</span>(<span class="string">"Error in find ref"</span>);
|
||
<span class="ident">repo</span>.<span class="ident">reference</span>(
|
||
<span class="kw-2">&</span><span class="ident">refname</span>,
|
||
<span class="ident">fetch_commit</span>.<span class="ident">id</span>(),
|
||
<span class="bool-val">true</span>,
|
||
<span class="kw-2">&</span><span class="macro">format!</span>(<span class="string">"Setting {} to {}"</span>, <span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>, <span class="ident">fetch_commit</span>.<span class="ident">id</span>()),
|
||
)
|
||
.<span class="ident">unwrap</span>();
|
||
<span class="ident">repo</span>.<span class="ident">set_head</span>(<span class="kw-2">&</span><span class="ident">refname</span>).<span class="ident">unwrap</span>();
|
||
<span class="ident">repo</span>.<span class="ident">checkout_head</span>(<span class="prelude-val">Some</span>(
|
||
<span class="ident">git2::build::CheckoutBuilder::default</span>()
|
||
.<span class="ident">allow_conflicts</span>(<span class="bool-val">true</span>)
|
||
.<span class="ident">conflict_style_merge</span>(<span class="bool-val">true</span>)
|
||
.<span class="ident">force</span>(),
|
||
))
|
||
.<span class="ident">unwrap</span>();
|
||
}
|
||
};
|
||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">analysis</span>.<span class="number">0</span>.<span class="ident">is_normal</span>() {
|
||
<span class="comment">// do a normal merge</span>
|
||
<span class="comment">// expects repo.head to point to the branch when is going to receive merges</span>
|
||
<span class="kw">let</span> <span class="ident">head_commit</span> <span class="op">=</span> <span class="ident">repo</span>
|
||
.<span class="ident">reference_to_annotated_commit</span>(<span class="kw-2">&</span><span class="ident">repo</span>.<span class="ident">head</span>().<span class="ident">unwrap</span>())
|
||
.<span class="ident">unwrap</span>();
|
||
<span class="ident"><span class="self">Self</span>::normal_merge</span>(<span class="kw-2">&</span><span class="ident">repo</span>, <span class="kw-2">&</span><span class="ident">head_commit</span>, <span class="kw-2">&</span><span class="ident">fetch_commit</span>).<span class="ident">unwrap</span>();
|
||
} <span class="kw">else</span> {
|
||
<span class="macro">log::info!</span>(<span class="string">"Nothing to do..."</span>);
|
||
}
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">_fetch_remote_branch</span>(<span class="kw-2">&</span><span class="self">self</span>, <span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>, <span class="ident">branch</span>: <span class="kw-2">&</span><span class="ident">str</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span>()<span class="op">></span> {
|
||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">remote</span> <span class="op">=</span> <span class="ident"><span class="self">Self</span>::get_deploy_remote</span>(<span class="ident">repo</span>)<span class="question-mark">?</span>;
|
||
<span class="ident">remote</span>.<span class="ident">connect</span>(<span class="ident">Direction::Fetch</span>)<span class="question-mark">?</span>;
|
||
<span class="macro">info!</span>(<span class="string">"Updating repository {}"</span>, <span class="self">self</span>.<span class="ident">repo</span>);
|
||
<span class="kw">let</span> <span class="ident">remote_branch_name</span> <span class="op">=</span> <span class="macro">format!</span>(<span class="string">"origin/{branch}"</span>);
|
||
<span class="ident">remote</span>.<span class="ident">fetch</span>(<span class="kw-2">&</span>[<span class="kw-2">&</span><span class="ident">remote_branch_name</span>], <span class="prelude-val">None</span>, <span class="prelude-val">None</span>)<span class="question-mark">?</span>;
|
||
<span class="ident">remote</span>.<span class="ident">disconnect</span>()<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">branch</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_branch</span>(<span class="kw-2">&</span><span class="ident">remote_branch_name</span>, <span class="ident">BranchType::Remote</span>)<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">commit</span> <span class="op">=</span> <span class="ident">branch</span>.<span class="ident">get</span>().<span class="ident">peel_to_commit</span>()<span class="question-mark">?</span>;
|
||
<span class="kw">if</span> <span class="ident">repo</span>.<span class="ident">find_branch</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>, <span class="ident">BranchType::Local</span>).<span class="ident">is_err</span>() {
|
||
<span class="ident">repo</span>.<span class="ident">branch</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>, <span class="kw-2">&</span><span class="ident">commit</span>, <span class="bool-val">true</span>)<span class="question-mark">?</span>;
|
||
}
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">normal_merge</span>(
|
||
<span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>,
|
||
<span class="ident">local</span>: <span class="kw-2">&</span><span class="ident">git2::AnnotatedCommit</span>,
|
||
<span class="ident">remote</span>: <span class="kw-2">&</span><span class="ident">git2::AnnotatedCommit</span>,
|
||
) -> <span class="prelude-ty">Result</span><span class="op"><</span>(), <span class="ident">git2::Error</span><span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">local_tree</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_commit</span>(<span class="ident">local</span>.<span class="ident">id</span>())<span class="question-mark">?</span>.<span class="ident">tree</span>().<span class="ident">unwrap</span>();
|
||
<span class="kw">let</span> <span class="ident">remote_tree</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_commit</span>(<span class="ident">remote</span>.<span class="ident">id</span>())<span class="question-mark">?</span>.<span class="ident">tree</span>().<span class="ident">unwrap</span>();
|
||
<span class="macro">println!</span>(<span class="string">"{} {}"</span>, <span class="ident">local</span>.<span class="ident">id</span>(), <span class="ident">remote</span>.<span class="ident">id</span>());
|
||
<span class="kw">let</span> <span class="ident">ancestor</span> <span class="op">=</span> <span class="ident">repo</span>
|
||
.<span class="ident">find_commit</span>(<span class="ident">repo</span>.<span class="ident">merge_base</span>(<span class="ident">local</span>.<span class="ident">id</span>(), <span class="ident">remote</span>.<span class="ident">id</span>()).<span class="ident">unwrap</span>())
|
||
.<span class="ident">unwrap</span>()
|
||
.<span class="ident">tree</span>()
|
||
.<span class="ident">unwrap</span>();
|
||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">idx</span> <span class="op">=</span> <span class="ident">repo</span>
|
||
.<span class="ident">merge_trees</span>(<span class="kw-2">&</span><span class="ident">ancestor</span>, <span class="kw-2">&</span><span class="ident">local_tree</span>, <span class="kw-2">&</span><span class="ident">remote_tree</span>, <span class="prelude-val">None</span>)
|
||
.<span class="ident">unwrap</span>();
|
||
|
||
<span class="kw">if</span> <span class="ident">idx</span>.<span class="ident">has_conflicts</span>() {
|
||
<span class="macro">log::debug!</span>(<span class="string">"Merge conflicts detected..."</span>);
|
||
<span class="ident">repo</span>.<span class="ident">checkout_index</span>(<span class="prelude-val">Some</span>(<span class="kw-2">&mut</span> <span class="ident">idx</span>), <span class="prelude-val">None</span>)<span class="question-mark">?</span>;
|
||
<span class="kw">return</span> <span class="prelude-val">Ok</span>(());
|
||
}
|
||
<span class="kw">let</span> <span class="ident">result_tree</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_tree</span>(<span class="ident">idx</span>.<span class="ident">write_tree_to</span>(<span class="ident">repo</span>)<span class="question-mark">?</span>)<span class="question-mark">?</span>;
|
||
<span class="comment">// now create the merge commit</span>
|
||
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="macro">format!</span>(<span class="string">"Merge: {} into {}"</span>, <span class="ident">remote</span>.<span class="ident">id</span>(), <span class="ident">local</span>.<span class="ident">id</span>());
|
||
<span class="kw">let</span> <span class="ident">sig</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">signature</span>()<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">local_commit</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_commit</span>(<span class="ident">local</span>.<span class="ident">id</span>())<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">remote_commit</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_commit</span>(<span class="ident">remote</span>.<span class="ident">id</span>())<span class="question-mark">?</span>;
|
||
<span class="comment">// Do our merge commit and set current branch head to that commit.</span>
|
||
<span class="kw">let</span> <span class="ident">_merge_commit</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">commit</span>(
|
||
<span class="prelude-val">Some</span>(<span class="string">"HEAD"</span>),
|
||
<span class="kw-2">&</span><span class="ident">sig</span>,
|
||
<span class="kw-2">&</span><span class="ident">sig</span>,
|
||
<span class="kw-2">&</span><span class="ident">msg</span>,
|
||
<span class="kw-2">&</span><span class="ident">result_tree</span>,
|
||
<span class="kw-2">&</span>[<span class="kw-2">&</span><span class="ident">local_commit</span>, <span class="kw-2">&</span><span class="ident">remote_commit</span>],
|
||
)<span class="question-mark">?</span>;
|
||
<span class="comment">// Set working tree to match head.</span>
|
||
<span class="ident">repo</span>.<span class="ident">checkout_head</span>(<span class="prelude-val">None</span>)<span class="question-mark">?</span>;
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">fn</span> <span class="ident">fast_forward</span>(
|
||
<span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>,
|
||
<span class="ident">lb</span>: <span class="kw-2">&mut</span> <span class="ident">git2::Reference</span>,
|
||
<span class="ident">rc</span>: <span class="kw-2">&</span><span class="ident">git2::AnnotatedCommit</span>,
|
||
) -> <span class="ident">ServiceResult</span><span class="op"><</span>()<span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">name</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">lb</span>.<span class="ident">name</span>() {
|
||
<span class="prelude-val">Some</span>(<span class="ident">s</span>) => <span class="ident">s</span>.<span class="ident">to_string</span>(),
|
||
<span class="prelude-val">None</span> => <span class="ident">String::from_utf8_lossy</span>(<span class="ident">lb</span>.<span class="ident">name_bytes</span>()).<span class="ident">to_string</span>(),
|
||
};
|
||
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="macro">format!</span>(<span class="string">"Fast-Forward: Setting {} to id: {}"</span>, <span class="ident">name</span>, <span class="ident">rc</span>.<span class="ident">id</span>());
|
||
<span class="macro">log::debug!</span>(<span class="string">"{}"</span>, <span class="ident">msg</span>);
|
||
<span class="ident">lb</span>.<span class="ident">set_target</span>(<span class="ident">rc</span>.<span class="ident">id</span>(), <span class="kw-2">&</span><span class="ident">msg</span>)<span class="question-mark">?</span>;
|
||
<span class="ident">repo</span>.<span class="ident">set_head</span>(<span class="kw-2">&</span><span class="ident">name</span>)<span class="question-mark">?</span>;
|
||
<span class="ident">repo</span>.<span class="ident">checkout_head</span>(<span class="prelude-val">Some</span>(<span class="ident">git2::build::CheckoutBuilder::default</span>().<span class="ident">force</span>()))<span class="question-mark">?</span>;
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">update</span>(<span class="kw-2">&</span><span class="self">self</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span>()<span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">repo</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">create_repo</span>()<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">fetch_commit</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">fetch</span>(<span class="kw-2">&</span><span class="ident">repo</span>)<span class="question-mark">?</span>;
|
||
<span class="self">self</span>.<span class="ident">merge</span>(<span class="kw-2">&</span><span class="ident">repo</span>, <span class="ident">fetch_commit</span>)<span class="question-mark">?</span>;
|
||
<span class="prelude-val">Ok</span>(())
|
||
}
|
||
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_deploy_branch</span>(<span class="kw-2">&</span><span class="self">self</span>, <span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">String</span><span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">branch</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">find_branch</span>(<span class="kw-2">&</span><span class="self">self</span>.<span class="ident">branch</span>, <span class="ident">BranchType::Local</span>)<span class="question-mark">?</span>;
|
||
<span class="kw">if</span> <span class="ident">branch</span>.<span class="ident">is_head</span>() {
|
||
<span class="prelude-val">Ok</span>(<span class="self">self</span>.<span class="ident">branch</span>.<span class="ident">clone</span>())
|
||
} <span class="kw">else</span> {
|
||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError::BranchNotFound</span>(<span class="self">self</span>.<span class="ident">branch</span>.<span class="ident">clone</span>()))
|
||
}
|
||
}
|
||
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_deploy_commit</span>(<span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">Oid</span><span class="op">></span> {
|
||
<span class="kw">let</span> <span class="ident">head</span> <span class="op">=</span> <span class="ident">repo</span>.<span class="ident">head</span>()<span class="question-mark">?</span>;
|
||
<span class="kw">let</span> <span class="ident">commit</span> <span class="op">=</span> <span class="ident">head</span>.<span class="ident">peel_to_commit</span>()<span class="question-mark">?</span>;
|
||
<span class="prelude-val">Ok</span>(<span class="ident">commit</span>.<span class="ident">id</span>())
|
||
}
|
||
|
||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_deploy_remote</span>(<span class="ident">repo</span>: <span class="kw-2">&</span><span class="ident">Repository</span>) -> <span class="ident">ServiceResult</span><span class="op"><</span><span class="ident">Remote</span><span class="op">></span> {
|
||
<span class="prelude-val">Ok</span>(<span class="ident">repo</span>.<span class="ident">find_remote</span>(<span class="string">"origin"</span>)<span class="question-mark">?</span>)
|
||
}
|
||
}
|
||
|
||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
|
||
<span class="kw">mod</span> <span class="ident">tests</span> {
|
||
<span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
|
||
|
||
<span class="kw">use</span> <span class="ident">git2::Repository</span>;
|
||
<span class="kw">use</span> <span class="ident">mktemp::Temp</span>;
|
||
|
||
<span class="attribute">#[<span class="ident">actix_rt::test</span>]</span>
|
||
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">pages_works</span>() {
|
||
<span class="kw">let</span> <span class="ident">tmp_dir</span> <span class="op">=</span> <span class="ident">Temp::new_dir</span>().<span class="ident">unwrap</span>();
|
||
<span class="macro">assert!</span>(<span class="ident">tmp_dir</span>.<span class="ident">exists</span>(), <span class="string">"tmp directory successully created"</span>);
|
||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">page</span> <span class="op">=</span> <span class="ident">Page</span> {
|
||
<span class="ident">secret</span>: <span class="ident">String::default</span>(),
|
||
<span class="ident">repo</span>: <span class="string">"https://github.com/mcaptcha/website"</span>.<span class="ident">to_owned</span>(),
|
||
<span class="ident">path</span>: <span class="ident">tmp_dir</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>().<span class="ident">to_string</span>(),
|
||
<span class="ident">branch</span>: <span class="string">"gh-pages"</span>.<span class="ident">to_string</span>(),
|
||
};
|
||
|
||
<span class="macro">assert!</span>(
|
||
<span class="ident">Repository::open</span>(<span class="ident">tmp_dir</span>.<span class="ident">as_path</span>()).<span class="ident">is_err</span>(),
|
||
<span class="string">"repository doesn't exist yet"</span>
|
||
);
|
||
|
||
<span class="kw">let</span> <span class="ident">repo</span> <span class="op">=</span> <span class="ident">page</span>.<span class="ident">create_repo</span>().<span class="ident">unwrap</span>();
|
||
<span class="macro">assert!</span>(<span class="op">!</span><span class="ident">repo</span>.<span class="ident">is_bare</span>(), <span class="string">"repository isn't bare"</span>);
|
||
<span class="ident">page</span>.<span class="ident">create_repo</span>().<span class="ident">unwrap</span>();
|
||
<span class="macro">assert!</span>(
|
||
<span class="ident">Repository::open</span>(<span class="ident">tmp_dir</span>.<span class="ident">as_path</span>()).<span class="ident">is_ok</span>(),
|
||
<span class="string">"repository exists yet"</span>
|
||
);
|
||
|
||
<span class="kw">let</span> <span class="ident">gh_pages</span> <span class="op">=</span> <span class="ident">page</span>.<span class="ident">get_deploy_branch</span>(<span class="kw-2">&</span><span class="ident">repo</span>).<span class="ident">unwrap</span>();
|
||
<span class="macro">assert_eq!</span>(<span class="ident">gh_pages</span>, <span class="string">"gh-pages"</span>);
|
||
<span class="ident">page</span>.<span class="ident">branch</span> <span class="op">=</span> <span class="string">"master"</span>.<span class="ident">to_string</span>();
|
||
<span class="ident">page</span>.<span class="ident">update</span>().<span class="ident">unwrap</span>();
|
||
<span class="kw">let</span> <span class="ident">master</span> <span class="op">=</span> <span class="ident">page</span>.<span class="ident">get_deploy_branch</span>(<span class="kw-2">&</span><span class="ident">repo</span>).<span class="ident">unwrap</span>();
|
||
<span class="macro">assert_eq!</span>(<span class="ident">master</span>, <span class="string">"master"</span>);
|
||
|
||
<span class="macro">assert_eq!</span>(
|
||
<span class="ident">Page::get_deploy_remote</span>(<span class="kw-2">&</span><span class="ident">repo</span>).<span class="ident">unwrap</span>().<span class="ident">url</span>().<span class="ident">unwrap</span>(),
|
||
<span class="ident">page</span>.<span class="ident">repo</span>
|
||
);
|
||
}
|
||
}
|
||
</code></pre></div>
|
||
</section></div></main><div id="rustdoc-vars" data-root-path="../../" data-current-crate="pages" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.63.0 (4b91a6ea7 2022-08-08)" ></div>
|
||
</body></html> |