SliTaz Repositories

     1.1 --- a/en/devel/index.html	Sat Jan 17 14:17:04 2009 +0000
     1.2 +++ b/en/devel/index.html	Sun Jan 18 21:43:10 2009 +0000
     1.3 @@ -68,6 +68,7 @@
     1.4  <h2><font color="#df8f06">SliTaz Developers corner</font></h2>
     1.5  
     1.6  <ul>
     1.7 +	<li><a href="#tank">Build host &amp; home.</a></li>
     1.8  	<li><a href="#repos">Mercurial repositories.</a></li>
     1.9  	<li><a href="#pkgs">Tazpkg packages.</a></li>
    1.10  	<li><a href="#website">Website Management.</a></li>
    1.11 @@ -93,6 +94,16 @@
    1.12  and the <a href="../mailing-list.html">Mailing List</a>.
    1.13  </p>
    1.14  
    1.15 +<a name="tank"></a>
    1.16 +<h3>Tank - Build host &amp; home</h3>
    1.17 +<p>
    1.18 +Each contributor may have an account on the project server with secure access,
    1.19 +disk space, a public directory and all development tools. Developers can compile 
    1.20 +packages and maintainers of the mirror can handle sychronization. Tank also 
    1.21 +hosts the website, web boot and mercurial repositories:
    1.22 +<a href="http://tank.slitaz.org/">tank.slitaz.org</a>
    1.23 +</p>
    1.24 +
    1.25  <a name="repos"></a>
    1.26  <h3>Mercurial repositories</h3>
    1.27  <p>
    1.28 @@ -114,13 +125,13 @@
    1.29  </pre>
    1.30  <h4>Clone, modify, commit and push</h4>
    1.31  <p>
    1.32 -Clone a repo, example for slitaz-doc:
    1.33 +Clone a repo, example for wok:
    1.34  </p>
    1.35  <pre>
    1.36 - $ hg clone http://repos.slitaz.org/slitaz-doc
    1.37 + $ hg clone http://repos.slitaz.org/wok
    1.38  </pre>
    1.39  <p>
    1.40 -Change directory to slitaz-doc, note you must be in the repository to be able 
    1.41 +Change directory to wok, note you must be in the repository to be able 
    1.42  to use 'hg' commands. To check all logs or just the last log:
    1.43  </p>
    1.44  <pre>
    1.45 @@ -128,9 +139,10 @@
    1.46   $ hg head
    1.47  </pre>
    1.48  <p>
    1.49 -Modify one or more files and commit:
    1.50 +Add or modify one or more files and commit:
    1.51  </p>
    1.52  <pre>
    1.53 + $ hg add
    1.54   $ hg status
    1.55   $ hg commit -m "Log message..."
    1.56   $ hg log
    1.57 @@ -146,6 +158,25 @@
    1.58  <p>
    1.59  Done, your changes, code or corrections are now on the server.
    1.60  </p>
    1.61 +<h4>Updating a local wok</h4>
    1.62 +<p>
    1.63 +To update your wok with the local server (<em>pull</em> to pull the changes) :
    1.64 +</p>
    1.65 +<pre>
    1.66 + $ hg pull
    1.67 + $ hg update
    1.68 +</pre>
    1.69 +<h4>Hg commands</h4>
    1.70 +<p>
    1.71 +Hg commands that can be used.
    1.72 +</p>
    1.73 +<ul>
    1.74 +	<li><code>hg help</code> : Display the full list of commands.</li>
    1.75 +	<li><code>hg rollback</code> : Undo the last action performed (commit,
    1.76 +	pull, push).</li>
    1.77 +	<li><code>hg log &lt;package&gt;</code> : Display a package log.</li>
    1.78 +	<li><code>hg head</code> : Display the last log.</li>
    1.79 +</ul>
    1.80  
    1.81  <a name="pkgs"></a>
    1.82  <h3>Tazpkg Packages</h3>
    1.83 @@ -168,7 +199,7 @@
    1.84  </p>
    1.85  <p>
    1.86  Before you begin to compile and create packages for SliTaz, be sure that the 
    1.87 -work doesn't already exist in the wok indigest provided by the primary SliTaz
    1.88 +work doesn't already exist in the wok undigest provided by the primary SliTaz
    1.89  mirror. Don't forget that the members of the list are there to help you
    1.90  and that the documentation of the 
    1.91  <a href="../doc/cookbook/wok-tools.html">wok and tools</a> 
    1.92 @@ -178,31 +209,22 @@
    1.93  <a name="website"></a>
    1.94  <h3>Website Management and Books</h3>
    1.95  <p>
    1.96 -The management of the website and books (Handbook &amp; Cookbook) is made via 
    1.97 -a rsync module, Mercurial, diff and patch utilities and the Mailing List. 
    1.98 -Rsync is a tool for incremental backup; using an ultra-fast algorithm, It can 
    1.99 -transfer or syncronize data both locally or over the network. The 
   1.100 -<code>diff</code> utility is used to send the list of files containing only 
   1.101 -the changes and <code>patch</code> to apply the changes to the original pages.
   1.102 -</p>
   1.103 -<p>
   1.104 -You can syncronize the site and books graphically using Grsync or via the 
   1.105 -command line. To download the site for the first time or syncronize pages 
   1.106 -in the directory <code>/home/hacker/Public/slitaz/website</code>; 
   1.107 -use the module <code>rsync://slitaz.org/website</code>:
   1.108 +The website and books (Handbook and Cookbook) are managed via
   1.109 +a mercurial repository, they can be cloned using:
   1.110  </p>
   1.111  <pre>
   1.112 - $ rsync -r -t -p -v \
   1.113 -       --progress --delete \
   1.114 -       rsync://slitaz.org/website /home/hacker/Public/slitaz/website
   1.115 + $ hg clone http://hg.slitaz.org/website
   1.116 +  Or if you have the proper permissions:
   1.117 + $ hg clone http://repos.slitaz.org/website
   1.118  </pre>
   1.119 +
   1.120  <h4>Diff and patch</h4>
   1.121  <p>
   1.122  The utilities <code>diff</code> and <code>patch</code> are command-line tools 
   1.123 -for creating and implementing differences between two files. This technique
   1.124 -is often used for collaboration and the changes made to the original file can 
   1.125 -be clearly extracted. To create a <code>diff</code> file readable by humans in
   1.126 -a simple text editor, you must supply the <code>-u</code> option:
   1.127 +for creating and implementing a file containing differences between two files. 
   1.128 +This technique is often used for collaboration and the changes made to the 
   1.129 +original file can be clearly extracted. To create a <code>diff</code> file 
   1.130 +readable by humans in a simple text editor, you must supply the <code>-u</code> option:
   1.131  </p>
   1.132  <pre>
   1.133   $ diff -u file.orig file.new &gt; file.diff