diff options
Diffstat (limited to 'doc/classes/Git/Branch.html')
| -rw-r--r-- | doc/classes/Git/Branch.html | 188 |
1 files changed, 118 insertions, 70 deletions
diff --git a/doc/classes/Git/Branch.html b/doc/classes/Git/Branch.html index 9b392fd..953f7ae 100644 --- a/doc/classes/Git/Branch.html +++ b/doc/classes/Git/Branch.html @@ -88,16 +88,18 @@ <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000072">checkout</a> - <a href="#M000074">create</a> - <a href="#M000076">current</a> - <a href="#M000075">delete</a> - <a href="#M000071">gcommit</a> - <a href="#M000073">in_branch</a> - <a href="#M000077">merge</a> - <a href="#M000070">new</a> - <a href="#M000078">to_a</a> - <a href="#M000079">to_s</a> + <a href="#M000080">archive</a> + <a href="#M000079">checkout</a> + <a href="#M000082">create</a> + <a href="#M000084">current</a> + <a href="#M000083">delete</a> + <a href="#M000078">gcommit</a> + <a href="#M000081">in_branch</a> + <a href="#M000085">merge</a> + <a href="#M000077">new</a> + <a href="#M000087">to_a</a> + <a href="#M000088">to_s</a> + <a href="#M000086">update_ref</a> </div> </div> @@ -142,19 +144,19 @@ <div id="methods"> <h3 class="section-bar">Public Class methods</h3> - <div id="method-M000070" class="method-detail"> - <a name="M000070"></a> + <div id="method-M000077" class="method-detail"> + <a name="M000077"></a> <div class="method-heading"> - <a href="#M000070" class="method-signature"> + <a href="#M000077" class="method-signature"> <span class="method-name">new</span><span class="method-args">(base, name)</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000070-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000070-source"> + onclick="toggleCode('M000077-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000077-source"> <pre> <span class="ruby-comment cmt"># File lib/git/branch.rb, line 9</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">base</span>, <span class="ruby-identifier">name</span>) @@ -177,45 +179,68 @@ <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000072" class="method-detail"> - <a name="M000072"></a> + <div id="method-M000080" class="method-detail"> + <a name="M000080"></a> <div class="method-heading"> - <a href="#M000072" class="method-signature"> + <a href="#M000080" class="method-signature"> + <span class="method-name">archive</span><span class="method-args">(file, opts = {})</span> + </a> + </div> + + <div class="method-description"> + <p><a class="source-toggle" href="#" + onclick="toggleCode('M000080-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000080-source"> +<pre> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 33</span> + <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">archive</span>(<span class="ruby-identifier">file</span>, <span class="ruby-identifier">opts</span> = {}) + <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">lib</span>.<span class="ruby-identifier">archive</span>(<span class="ruby-ivar">@full</span>, <span class="ruby-identifier">file</span>, <span class="ruby-identifier">opts</span>) + <span class="ruby-keyword kw">end</span> +</pre> + </div> + </div> + </div> + + <div id="method-M000079" class="method-detail"> + <a name="M000079"></a> + + <div class="method-heading"> + <a href="#M000079" class="method-signature"> <span class="method-name">checkout</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000072-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000072-source"> + onclick="toggleCode('M000079-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000079-source"> <pre> <span class="ruby-comment cmt"># File lib/git/branch.rb, line 28</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkout</span> <span class="ruby-identifier">check_if_create</span> - <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">checkout</span>(<span class="ruby-ivar">@name</span>) + <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">checkout</span>(<span class="ruby-ivar">@full</span>) <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> - <div id="method-M000074" class="method-detail"> - <a name="M000074"></a> + <div id="method-M000082" class="method-detail"> + <a name="M000082"></a> <div class="method-heading"> - <a href="#M000074" class="method-signature"> + <a href="#M000082" class="method-signature"> <span class="method-name">create</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000074-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000074-source"> + onclick="toggleCode('M000082-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000082-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 50</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 53</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">create</span> <span class="ruby-identifier">check_if_create</span> <span class="ruby-keyword kw">end</span> @@ -224,21 +249,21 @@ </div> </div> - <div id="method-M000076" class="method-detail"> - <a name="M000076"></a> + <div id="method-M000084" class="method-detail"> + <a name="M000084"></a> <div class="method-heading"> - <a href="#M000076" class="method-signature"> + <a href="#M000084" class="method-signature"> <span class="method-name">current</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000076-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000076-source"> + onclick="toggleCode('M000084-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000084-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 58</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 61</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">current</span> <span class="ruby-identifier">determine_current</span> <span class="ruby-keyword kw">end</span> @@ -247,21 +272,21 @@ </div> </div> - <div id="method-M000075" class="method-detail"> - <a name="M000075"></a> + <div id="method-M000083" class="method-detail"> + <a name="M000083"></a> <div class="method-heading"> - <a href="#M000075" class="method-signature"> + <a href="#M000083" class="method-signature"> <span class="method-name">delete</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000075-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000075-source"> + onclick="toggleCode('M000083-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000083-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 54</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 57</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete</span> <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">lib</span>.<span class="ruby-identifier">branch_delete</span>(<span class="ruby-ivar">@name</span>) <span class="ruby-keyword kw">end</span> @@ -270,23 +295,23 @@ </div> </div> - <div id="method-M000071" class="method-detail"> - <a name="M000071"></a> + <div id="method-M000078" class="method-detail"> + <a name="M000078"></a> <div class="method-heading"> - <a href="#M000071" class="method-signature"> + <a href="#M000078" class="method-signature"> <span class="method-name">gcommit</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000071-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000071-source"> + onclick="toggleCode('M000078-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000078-source"> <pre> <span class="ruby-comment cmt"># File lib/git/branch.rb, line 23</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">gcommit</span> - <span class="ruby-ivar">@gcommit</span> = <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">object</span>(<span class="ruby-identifier">name</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@gcommit</span> + <span class="ruby-ivar">@gcommit</span> = <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">object</span>(<span class="ruby-ivar">@full</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@gcommit</span> <span class="ruby-ivar">@gcommit</span> <span class="ruby-keyword kw">end</span> </pre> @@ -294,11 +319,11 @@ </div> </div> - <div id="method-M000073" class="method-detail"> - <a name="M000073"></a> + <div id="method-M000081" class="method-detail"> + <a name="M000081"></a> <div class="method-heading"> - <a href="#M000073" class="method-signature"> + <a href="#M000081" class="method-signature"> <span class="method-name">in_branch</span><span class="method-args">(message = 'in branch work') {|| ...}</span> </a> </div> @@ -306,7 +331,7 @@ <div class="method-description"> <p> g.branch(‘new_branch’).<a -href="Branch.html#M000073">in_branch</a> do +href="Branch.html#M000081">in_branch</a> do </p> <pre> # create new file @@ -317,10 +342,10 @@ href="Branch.html#M000073">in_branch</a> do end </p> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000073-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000073-source"> + onclick="toggleCode('M000081-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000081-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 39</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 42</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">in_branch</span> (<span class="ruby-identifier">message</span> = <span class="ruby-value str">'in branch work'</span>) <span class="ruby-identifier">old_current</span> = <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">lib</span>.<span class="ruby-identifier">branch_current</span> <span class="ruby-identifier">checkout</span> @@ -336,21 +361,21 @@ end </div> </div> - <div id="method-M000077" class="method-detail"> - <a name="M000077"></a> + <div id="method-M000085" class="method-detail"> + <a name="M000085"></a> <div class="method-heading"> - <a href="#M000077" class="method-signature"> + <a href="#M000085" class="method-signature"> <span class="method-name">merge</span><span class="method-args">(branch = nil, message = nil)</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000077-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000077-source"> + onclick="toggleCode('M000085-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000085-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 62</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 65</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">message</span> = <span class="ruby-keyword kw">nil</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">branch</span> <span class="ruby-identifier">in_branch</span> <span class="ruby-keyword kw">do</span> @@ -368,21 +393,21 @@ end </div> </div> - <div id="method-M000078" class="method-detail"> - <a name="M000078"></a> + <div id="method-M000087" class="method-detail"> + <a name="M000087"></a> <div class="method-heading"> - <a href="#M000078" class="method-signature"> + <a href="#M000087" class="method-signature"> <span class="method-name">to_a</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000078-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000078-source"> + onclick="toggleCode('M000087-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000087-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 75</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 82</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_a</span> [<span class="ruby-ivar">@full</span>] <span class="ruby-keyword kw">end</span> @@ -391,21 +416,21 @@ end </div> </div> - <div id="method-M000079" class="method-detail"> - <a name="M000079"></a> + <div id="method-M000088" class="method-detail"> + <a name="M000088"></a> <div class="method-heading"> - <a href="#M000079" class="method-signature"> + <a href="#M000088" class="method-signature"> <span class="method-name">to_s</span><span class="method-args">()</span> </a> </div> <div class="method-description"> <p><a class="source-toggle" href="#" - onclick="toggleCode('M000079-source');return false;">[Source]</a></p> - <div class="method-source-code" id="M000079-source"> + onclick="toggleCode('M000088-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000088-source"> <pre> -<span class="ruby-comment cmt"># File lib/git/branch.rb, line 79</span> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 86</span> <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span> <span class="ruby-ivar">@full</span> <span class="ruby-keyword kw">end</span> @@ -414,6 +439,29 @@ end </div> </div> + <div id="method-M000086" class="method-detail"> + <a name="M000086"></a> + + <div class="method-heading"> + <a href="#M000086" class="method-signature"> + <span class="method-name">update_ref</span><span class="method-args">(commit)</span> + </a> + </div> + + <div class="method-description"> + <p><a class="source-toggle" href="#" + onclick="toggleCode('M000086-source');return false;">[Source]</a></p> + <div class="method-source-code" id="M000086-source"> +<pre> +<span class="ruby-comment cmt"># File lib/git/branch.rb, line 78</span> + <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_ref</span>(<span class="ruby-identifier">commit</span>) + <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">lib</span>.<span class="ruby-identifier">update_ref</span>(<span class="ruby-ivar">@full</span>, <span class="ruby-identifier">commit</span>) + <span class="ruby-keyword kw">end</span> +</pre> + </div> + </div> + </div> + </div> |