summaryrefslogtreecommitdiffstats
path: root/doc/classes/Git/Branch.html
diff options
context:
space:
mode:
Diffstat (limited to 'doc/classes/Git/Branch.html')
-rw-r--r--doc/classes/Git/Branch.html429
1 files changed, 429 insertions, 0 deletions
diff --git a/doc/classes/Git/Branch.html b/doc/classes/Git/Branch.html
new file mode 100644
index 0000000..aa97d6b
--- /dev/null
+++ b/doc/classes/Git/Branch.html
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Class: Git::Branch</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
+ <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+ <script type="text/javascript">
+ // <![CDATA[
+
+ function popupCode( url ) {
+ window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+ }
+
+ function toggleCode( id ) {
+ if ( document.getElementById )
+ elem = document.getElementById( id );
+ else if ( document.all )
+ elem = eval( "document.all." + id );
+ else
+ return false;
+
+ elemStyle = elem.style;
+
+ if ( elemStyle.display != "block" ) {
+ elemStyle.display = "block"
+ } else {
+ elemStyle.display = "none"
+ }
+
+ return true;
+ }
+
+ // Make codeblocks hidden by default
+ document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
+
+ // ]]>
+ </script>
+
+</head>
+<body>
+
+
+
+ <div id="classHeader">
+ <table class="header-table">
+ <tr class="top-aligned-row">
+ <td><strong>Class</strong></td>
+ <td class="class-name-in-header">Git::Branch</td>
+ </tr>
+ <tr class="top-aligned-row">
+ <td><strong>In:</strong></td>
+ <td>
+ <a href="../../files/lib/git/branch_rb.html">
+ lib/git/branch.rb
+ </a>
+ <br />
+ </td>
+ </tr>
+
+ <tr class="top-aligned-row">
+ <td><strong>Parent:</strong></td>
+ <td>
+ <a href="Path.html">
+ Path
+ </a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <!-- banner header -->
+
+ <div id="bodyContent">
+
+
+
+ <div id="contextContent">
+
+
+
+ </div>
+
+ <div id="method-list">
+ <h3 class="section-bar">Methods</h3>
+
+ <div class="name-list">
+ <a href="#M000068">checkout</a>&nbsp;&nbsp;
+ <a href="#M000070">create</a>&nbsp;&nbsp;
+ <a href="#M000072">current</a>&nbsp;&nbsp;
+ <a href="#M000071">delete</a>&nbsp;&nbsp;
+ <a href="#M000067">gcommit</a>&nbsp;&nbsp;
+ <a href="#M000069">in_branch</a>&nbsp;&nbsp;
+ <a href="#M000073">merge</a>&nbsp;&nbsp;
+ <a href="#M000066">new</a>&nbsp;&nbsp;
+ <a href="#M000074">to_a</a>&nbsp;&nbsp;
+ <a href="#M000075">to_s</a>&nbsp;&nbsp;
+ </div>
+ </div>
+
+ </div>
+
+
+ <!-- if includes -->
+
+ <div id="section">
+
+
+
+
+
+ <div id="attribute-list">
+ <h3 class="section-bar">Attributes</h3>
+
+ <div class="name-list">
+ <table>
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">full</td>
+ <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+ <td class="context-item-desc"></td>
+ </tr>
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">name</td>
+ <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+ <td class="context-item-desc"></td>
+ </tr>
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">remote</td>
+ <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+ <td class="context-item-desc"></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+
+
+ <!-- if method_list -->
+ <div id="methods">
+ <h3 class="section-bar">Public Class methods</h3>
+
+ <div id="method-M000066" class="method-detail">
+ <a name="M000066"></a>
+
+ <div class="method-heading">
+ <a href="#M000066" 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('M000066-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000066-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>)
+ <span class="ruby-ivar">@remote</span> = <span class="ruby-keyword kw">nil</span>
+ <span class="ruby-ivar">@full</span> = <span class="ruby-identifier">name</span>
+ <span class="ruby-ivar">@base</span> = <span class="ruby-identifier">base</span>
+
+ <span class="ruby-identifier">parts</span> = <span class="ruby-identifier">name</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'/'</span>)
+ <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">parts</span>[<span class="ruby-value">1</span>]
+ <span class="ruby-ivar">@remote</span> = <span class="ruby-constant">Git</span><span class="ruby-operator">::</span><span class="ruby-constant">Remote</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@base</span>, <span class="ruby-identifier">parts</span>[<span class="ruby-value">0</span>])
+ <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">parts</span>[<span class="ruby-value">1</span>]
+ <span class="ruby-keyword kw">else</span>
+ <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">parts</span>[<span class="ruby-value">0</span>]
+ <span class="ruby-keyword kw">end</span>
+ <span class="ruby-keyword kw">end</span>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <h3 class="section-bar">Public Instance methods</h3>
+
+ <div id="method-M000068" class="method-detail">
+ <a name="M000068"></a>
+
+ <div class="method-heading">
+ <a href="#M000068" 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('M000068-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000068-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-keyword kw">end</span>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000070" class="method-detail">
+ <a name="M000070"></a>
+
+ <div class="method-heading">
+ <a href="#M000070" 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('M000070-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000070-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 50</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>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000072" class="method-detail">
+ <a name="M000072"></a>
+
+ <div class="method-heading">
+ <a href="#M000072" 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('M000072-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000072-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 58</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>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000071" class="method-detail">
+ <a name="M000071"></a>
+
+ <div class="method-heading">
+ <a href="#M000071" 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('M000071-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000071-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 54</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>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000067" class="method-detail">
+ <a name="M000067"></a>
+
+ <div class="method-heading">
+ <a href="#M000067" 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('M000067-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000067-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-keyword kw">end</span>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000069" class="method-detail">
+ <a name="M000069"></a>
+
+ <div class="method-heading">
+ <a href="#M000069" class="method-signature">
+ <span class="method-name">in_branch</span><span class="method-args">(message = 'in branch work') {|| ...}</span>
+ </a>
+ </div>
+
+ <div class="method-description">
+ <p>
+g.branch(&#8216;new_branch&#8217;).<a
+href="Branch.html#M000069">in_branch</a> do
+</p>
+<pre>
+ # create new file
+ # do other stuff
+ return true # auto commits and switches back
+</pre>
+<p>
+end
+</p>
+ <p><a class="source-toggle" href="#"
+ onclick="toggleCode('M000069-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000069-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 39</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>
+ <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">yield</span>
+ <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">commit_all</span>(<span class="ruby-identifier">message</span>)
+ <span class="ruby-keyword kw">else</span>
+ <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">reset_hard</span>
+ <span class="ruby-keyword kw">end</span>
+ <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">checkout</span>(<span class="ruby-identifier">old_current</span>)
+ <span class="ruby-keyword kw">end</span>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000073" class="method-detail">
+ <a name="M000073"></a>
+
+ <div class="method-heading">
+ <a href="#M000073" 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('M000073-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000073-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 62</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>
+ <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span>, <span class="ruby-identifier">message</span>)
+ <span class="ruby-keyword kw">false</span>
+ <span class="ruby-keyword kw">end</span>
+ <span class="ruby-comment cmt"># merge a branch into this one</span>
+ <span class="ruby-keyword kw">else</span>
+ <span class="ruby-comment cmt"># merge this branch into the current one</span>
+ <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-ivar">@name</span>)
+ <span class="ruby-keyword kw">end</span>
+ <span class="ruby-keyword kw">end</span>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000074" class="method-detail">
+ <a name="M000074"></a>
+
+ <div class="method-heading">
+ <a href="#M000074" 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('M000074-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000074-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 75</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>
+</pre>
+ </div>
+ </div>
+ </div>
+
+ <div id="method-M000075" class="method-detail">
+ <a name="M000075"></a>
+
+ <div class="method-heading">
+ <a href="#M000075" 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('M000075-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="M000075-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/git/branch.rb, line 79</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>
+</pre>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+
+ </div>
+
+
+<div id="validator-badges">
+ <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html> \ No newline at end of file