mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
Update repository URLs and checkout info now expoweb is in git
This commit is contained in:
parent
13cf3b1628
commit
e7491f6c60
@ -53,10 +53,10 @@ processes that a maintainer would want to do.</p>
|
||||
<h3 id="git">Version control system</a></h3>
|
||||
<p>We use a distributed revision control system (<a href="https://git-scm.com/about/distributed">git</a>, and formerly mercurial) for all the important data. (Note that we just use git: not GitHub, not GitLab, just <a href="https://git-scm.com/about/distributed">git</a>.)
|
||||
This means that many people can edit and merge their changes with the expo
|
||||
server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut
|
||||
server in Cambridge at the same time: including people still on expo in the Tatty Hut
|
||||
and those who have returned to the UK. Also anyone who is up
|
||||
to date can take their laptop somewhere and enter data even if they have no internet access,
|
||||
and the updates will be merged when they get back to civilization.
|
||||
and the updates can be merged when they get back to civilization.
|
||||
</p>
|
||||
<p>In principle, survey notes can be typed into a laptop up on the plateau which would
|
||||
then get synchronised when it next gets internet access.
|
||||
@ -65,8 +65,9 @@ then get synchronised when it next gets internet access.
|
||||
do not get modified, so they are kept as a plain directory of files 'expofiles'.
|
||||
The same goes for holiday photographs and GPS logs.</p>
|
||||
|
||||
<p>In 2019 we had half our <a href="manual.html#repositories">version-controlled repositories</a> under mercurial and half under git.
|
||||
The intention is to move entirely to git before the 2020 expo.
|
||||
<p>From 2012-2019 we used mercurial (aka 'hg'), but completed the move to git
|
||||
before the 2020 expo.</p>
|
||||
|
||||
<h3>Contents </h3>
|
||||
|
||||
<ol>
|
||||
@ -112,12 +113,12 @@ editing and keeps track of all changes so we can roll back and have branches if
|
||||
<p>The site has been split into four parts:</p>
|
||||
|
||||
<ul>
|
||||
<li><a href="/repositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/cgit/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/repositories/home/expo/expoweb/graph">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
|
||||
<li><a href="/cgit/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
<li><a href="/hgrepositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/repositories/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/repositories/expoweb/.git/log">expoweb</a> - the website pages, handbook, generation scripts (git)</li>
|
||||
<li><a href="/repositories/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
</ul>
|
||||
<p>We have migrated two of these to git but the other two still use mercurial.
|
||||
<p>We have migrated three of these to git but loser is still mercurial for a few more days.
|
||||
|
||||
|
||||
<h3><a id="cavepages">Updating cave pages</a></h3>
|
||||
|
@ -22,7 +22,7 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
|
||||
<p> Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.
|
||||
<dl>
|
||||
<dt>expoweb (The data management system) - this will fail until it is moved from hg to git</dt>
|
||||
<dt>expoweb (The website/data management system)</dt>
|
||||
<dd>
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</tt> (read/write)<br />
|
||||
</dd>
|
||||
@ -42,6 +42,9 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/drawings</tt> (read/write)<br />
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<p>The repositories are browseable at <a href="http://expo.survex.com/repositories/">http://expo.survex.com/repositories/</a></p>
|
||||
|
||||
<h3><a id="gitwindows">Using git in Windows</a></h3>
|
||||
|
||||
|
||||
@ -59,7 +62,7 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
|
||||
<p><tt>git commit</tt> (you can specify filenames to be specific)</p>
|
||||
|
||||
<p>The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage.
|
||||
<p>The first time you do this on a Windows machine it will probably not work as it does not recognise the server key exchange.
|
||||
Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server.
|
||||
If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.</p>
|
||||
|
||||
|
@ -63,7 +63,7 @@ To log out of PuTTy, type 'logout', then press the return/enter key.</p>
|
||||
<img src="expoRepositoryScreen.png" width="75%" height="50%" alt="Hg Workbench" />
|
||||
<p class="caption">Hg Workbench</p></div>
|
||||
|
||||
<p>At which point type <tt>ssh://expo@expo.survex.com/loser</tt> into
|
||||
<p>At which point type <tt>ssh://expo@expo.survex.com/repositories/hg/loser</tt> into
|
||||
the 'Source' box (in this case I have specified a particular folder on
|
||||
the server; 'loser', I suggest you do the same for now). You may also
|
||||
choose where you want the repository to be created by clicking
|
||||
@ -83,10 +83,10 @@ If you want to update the handbook or other parts of the website you will also n
|
||||
You can scan what's in the repositories (read only) using your web browser:
|
||||
|
||||
<ul>
|
||||
<li><a href="/repositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/cgit/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/repositories/home/expo/expoweb/graph">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
|
||||
<li><a href="/cgit/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
<li><a href="/hgrepositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/repositories/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/repositories/expoweb/.git/log">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
|
||||
<li><a href="/repositories/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
</ul>>
|
||||
|
||||
|
||||
|
@ -133,13 +133,13 @@ university since Feb 2014.
|
||||
|
||||
|
||||
<h3>2018</h3>
|
||||
<p>In 2018 we had 4 repositories:
|
||||
<p>In 2018 we had 4 repositories, 2 mercurial, 2 git
|
||||
|
||||
<ul>
|
||||
<li><a href="/repositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/cgit/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/repositories/home/expo/expoweb/graph">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
|
||||
<li><a href="/cgit/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
<li><a href="/hgrepositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
|
||||
<li><a href="/repositories/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
|
||||
<li><a href="/hgrepositories/home/expo/expoweb/graph">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
|
||||
<li><a href="/repositories/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
|
||||
</ul>
|
||||
|
||||
<p>In spring 2018 Sam, Wookey and Paul Fox updated the Linux version and the Django version (i.e. troggle) to
|
||||
|
Loading…
Reference in New Issue
Block a user