mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
More de-tortoising
This commit is contained in:
Philip Sargent
parent
743c3bb42f
commit
8f87fb90d9
@ -51,7 +51,7 @@ Note that you are loading your <em>private</em> key, the .ppk file, into pageant
|
||||
|
||||
<ul>
|
||||
|
||||
<li><a href="../tortoise/tortoise-win.htm">Installing PuTTy</a>.</li>
|
||||
<li><a href="../tortoise/putty.html">Installing PuTTy</a>.</li>
|
||||
<li><a href="winlaptop.html#hard">A Windows laptop for expo</a> - PuTTy and WSL here.</li>
|
||||
</ul>
|
||||
<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively
|
||||
|
||||
@ -14,9 +14,9 @@
|
||||
<p>'ssh' is 'secure shell' and is widely used for secure access to machines and services.</p>
|
||||
|
||||
<h2>What do I need to do?</h2>
|
||||
<p>You will need to run ssh-keygen/PuTTYgen on your device, email the public key to someone who already has ssh access (Wookey, Paul Fox, Philip Sargent, Sam Wenham). Once installed by them you should be able to log in as 'expo' over ssh (and other software like tortoise will also use this behind the scenes). This only needs doing once (for any machine you want access from).</p>
|
||||
<p>You will need to run ssh-keygen/PuTTYgen on your device, email the public key to someone who already has ssh access (Wookey, Paul Fox, Philip Sargent, Sam Wenham). Once installed by them you should be able to log in as 'expo' over ssh (and other software like git will also use this behind the scenes). This only needs doing once (for any machine you want access from).</p>
|
||||
|
||||
<p>Our own documentation for <a href="../tortoise/tortoise-win.htm">installing PuTTy on Windows</a>.
|
||||
<p>Our own documentation for <a href="../tortoise/putty.html">installing PuTTy on Windows</a>.
|
||||
|
||||
<p>Explanation of <a href="https://www.ssh.com/ssh/keygen/">key-pairs and the ssh-keygen command</a>.</p>
|
||||
|
||||
|
||||
@ -1,90 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>Handbook placeholder page</title>
|
||||
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
|
||||
</head>
|
||||
<body>
|
||||
<h2 id="tophead">CUCC Expedition Handbook - Mercurial Quick</h2>
|
||||
|
||||
<h1>Quick Reminder - Mercurial</h1>
|
||||
<h2>Version Control Software Reminders</h2>
|
||||
<p>This is NOT a tutorial. This is a set of reminders for people who already know all this stuff.
|
||||
|
||||
<p>Since 2019 all use of version control software requires that you
|
||||
have <a href="keyexchange.html">key-pair setup</a> already set up before any of this will work on your own machine.
|
||||
|
||||
<p>You can, however, do all this on the <i>expo laptop</i> as this has already been configured with the right keys.
|
||||
<dl>
|
||||
<dt>expoweb (The data management system)</dt>
|
||||
<dd>
|
||||
<tt>hg clone ssh://expo@expo.survex.com/expoweb</tt> (read/write)<br />
|
||||
<tt>hg clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only checkout)
|
||||
</dd>
|
||||
|
||||
<dt>troggle (The data management system backend)</dt>
|
||||
<dd>
|
||||
<tt>hg clone ssh://expo@expo.survex.com/troggle</tt> (read/write)<br />
|
||||
<tt>hg clone http://expo.survex.com/repositories/home/expo/troggle/</tt> (read-only checkout)
|
||||
</dd>
|
||||
|
||||
<dt>loser (The survey data)</dt>
|
||||
<dd>
|
||||
<tt>hg clone ssh://expo@expo.survex.com/loser</tt> (read/write)<br />
|
||||
<tt>hg clone http://expo.survex.com/repositories/home/expo/loser/</tt> (read-only)
|
||||
</dd>
|
||||
|
||||
<dt>drawings</dt>
|
||||
<dd>
|
||||
<tt>hg clone ssh://expo@expo.survex.com/drawings</tt> (read/write)<br />
|
||||
<tt>hg clone http://expo.survex.com/repositories/home/expo/drawings/</tt> (read-only)
|
||||
</dd>
|
||||
</dl>
|
||||
<h3><a id="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
|
||||
|
||||
<p>Read the instructions for setting up TortoiseHG in <a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. But this won't work at all until you set up the key-pair setup using PuTty/Pageant.
|
||||
<p>In Windows: install Mercurial and TortoiseHg of the relevant flavour from <a href="https://tortoisehg.bitbucket.io/">https://tortoisehg.bitbucket.io/</a> (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)</p>
|
||||
|
||||
<p>To start cloning a repository: first create the folders you need for the repositories you are going to use, e.g. D:\CUCC-Expo\loser and D:\CUCC-Expo\expoweb. Then start TortoiseHg Workbench from your Programs menu, click File -> Clone repository, a dialogue box will appear. In the Source box type</p>
|
||||
|
||||
|
||||
|
||||
<p>What follows is for Linux. If you are running Windows then see below <a href="#Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a>.
|
||||
|
||||
<p>Mercurial can be used from the command line, but if you prefer a GUI, TourtoiseHg is highly recommended on all OSes.</p>
|
||||
|
||||
<p>Linux: Install mercurial and tortoisehg-nautilus from synaptic,
|
||||
then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see the menus of tortoise within your Nautilus windows. </p>
|
||||
|
||||
<p>Once you've downloaded and installed a client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:</p>
|
||||
|
||||
<p><tt>hg clone ssh://expo@expo.survex.com/expoweb</tt></p>
|
||||
|
||||
<p>for subsequent updates</p>
|
||||
|
||||
<p><tt>hg update</tt></p>
|
||||
|
||||
<p>will generally do the trick.</p>
|
||||
|
||||
<p>In TortoiseHg, merely right-click on a folder you want to check out to, choose "Mercurial checkout," and enter</p>
|
||||
|
||||
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
|
||||
|
||||
<p>After you've made a change, commit it to you local copy with:</p>
|
||||
|
||||
<p><tt>hg commit</tt> (you can specify filenames to be specific)</p>
|
||||
|
||||
<p>or right clicking on the folder and going to commit in TortoiseHg. Mercurial can't always work out who you are. If you see a message like "abort: no username supplied" it was probably not set up to deduce that from your environment. It's easiest to give it the info in a config file at ~/.hgrc (create it if it doesn't exist, or add these lines if it already does) containing something like</p>
|
||||
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
|
||||
|
||||
<p>for expoweb (or similar for the other repositories). In the Destination box type whatever destination you want your local copies to live in on your laptop e.g. D:\CUCC-Expo\expoweb. Hit Clone, and it should hopefully prompt you for the usual beery password.
|
||||
|
||||
<p>The first time you do this it will probably not work as it does not recognise the server. 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 TortoiseHg should be able to clone the repo, and send changes back.</p>
|
||||
|
||||
|
||||
<hr />
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -69,7 +69,7 @@ If a heading is in italics, then there are hidden items.
|
||||
<dd><!--2020-04-11 psargent-->Look at <a href="https://www.gov.uk/guidance/government-design-principles">gov.uk guidelines</a> for inspiration</dd>
|
||||
<dt><!--2020-04-11 psargent-->When git migration done
|
||||
<dd>Edit out all mercurial
|
||||
<dd>Split the TortoiseHg/PuTTy documentationa nd retain only PuTTy
|
||||
|
||||
<dt><!-- 2020-04-11 psargent -->NOEDIT flag
|
||||
<dd><!-- 2020-04-11 psargent -->When editing multiple pages (using git), describe how this is implemented using <meta name="keywords" content="NOEDIT">
|
||||
<dt>Editing Logbooks
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<ul>
|
||||
<li><a href="#well">Things that already work well with a Windows laptop</a><br />
|
||||
- Editing the handbook webpages, typing up SVX files and transcribing the logbook, <br />
|
||||
- Anything where the file-transfer to the expo surver is via the version control software (TortoiseHg or Git-for-Windows)
|
||||
- Anything where the file-transfer to the expo server is via the git version control software
|
||||
<li><a href="#problems">Things that cause problems</a><br />
|
||||
- filenames and unintentional duplication because links are not understood by Windows,<br />
|
||||
- sFTP or scp for more than a handful of files
|
||||
@ -70,7 +70,7 @@ There are two types of linux links: hard links and symbolic links. Symbolic link
|
||||
|
||||
<h4>Symbolic links: the solution for Windows</h4>
|
||||
<ul>
|
||||
<li>When using the version control systems TortoiseHg or Git-for-Windows the download of a link works fine. But be careful not to edit the link file downloaded (it is just a text file holding the path of the file holding the actual contents) because then the version control client would upload it to the server and overwrite the link on the server with something that isn't a link. It also won't work as a Windows shortcut, but at least the default behaviour isn't actively dangerous.
|
||||
<li>When using the git version control systems the download of a link works fine. But be careful not to edit the link file downloaded (it is just a text file holding the path of the file holding the actual contents) because then the version control client would upload it to the server and overwrite the link on the server with something that isn't a link. It also won't work as a Windows shortcut, but at least the default behaviour isn't actively dangerous.
|
||||
<li>When using sFTP, manually check whether any files you are copying from the server are links - look at the symbol in Filezilla.
|
||||
<li>Be careful not to copy any links using sFTP and instead recreate them manually on the Windows filesystem using right-click "Create shortcut".
|
||||
<li>You will have to find out what to make the shortcut link to by logging in to the server (using a PuTTy ssh logon) and doing <span style="font-family:monospace; size=x-small; background-color: lightgray">"ls -l"</span> in the folder where the link is.
|
||||
|
||||
@ -51,7 +51,6 @@ but all the recommended software here is open source (and please don't install p
|
||||
<p>The list of software:
|
||||
<ul>
|
||||
<li><a href="https://git-scm.com/">git</a> - distributed version control system - already installed on Linux probably</li>
|
||||
<li><a href="https://tortoisehg.bitbucket.io/"> TortoiseHg</a> - GUI to mercurial (to be deprecated during 2020)</li>
|
||||
<li><a href="https://www.mercurial-scm.org/">mercurial</a> - distributed version control system (to be deprecated during 2020)</li>
|
||||
<li><a href="../fzconfig.html">Filezilla</a> - ftp GUI software with a configuration file to get to the expo server</li>
|
||||
<li><a href="https://survex.com/download.html">Survex</a>, including the Aven visualisation tool.
|
||||
@ -100,8 +99,6 @@ but all the recommended software here is open source (and please don't install p
|
||||
<li><a href="https://winscp.net/eng/download.php">WinScp</a> can be used as an alternative to Filezilla if you like.
|
||||
<li><a href="https://www.java.com/en/">java</a> - needed for GPSprune and CaveConverter. Has to be installed separately on a Windows machine.
|
||||
<li><a href="https://notepad-plus-plus.org/">Notepad++</a> or any other syntax-highlighting code editor for HTML and python such as <a href="https://www.aptana.com/">Aptana Studio</a>. Configuring these to syntax-highlight .svx files has yet to be done.
|
||||
<li>Read our instructions for setting up TortoiseHg in
|
||||
<a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. To be replaced by git in Sprin 2020.
|
||||
</ul>
|
||||
|
||||
<p>A short note about the phenomenon of VS code is in order. In case you didn't know, by 2018 over <a href="https://insights.stackoverflow.com/survey/2018">a third</a> of software developers used this editor for their Linux and Windows work and it is undoubtedly more now. Not for beginners.
|
||||
@ -131,17 +128,16 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
|
||||
<p><a href="../../documents/Idiots guide to accessing expo git.pdf">Idiots guide to setting up git for expo</a>
|
||||
- PDF - Brendan's guide. Uses PuTTy and GitKraken.
|
||||
|
||||
<p>The above gets TortoiseHg and the command-line PuTTY tools (ssd, sftp, pscp) running, but doesn't get Cygwin rsync working. You might like to try <a href="https://stackoverflow.com/questions/23517023/rsync-from-windows-to-linux-using-puttys-pagent-authentication">this</a> (untested).</p>
|
||||
<p>The above gets the command-line PuTTY tools (ssd, sftp, pscp) running, but doesn't get rsync working. You might like to try <a href="https://stackoverflow.com/questions/23517023/rsync-from-windows-to-linux-using-puttys-pagent-authentication">this</a> (untested).</p>
|
||||
|
||||
<p>Full illustrated instructions:<img src="https://wiki.filezilla-project.org/favicon.ico" width=64 hspace="20" align="right"></p>
|
||||
|
||||
<ul>
|
||||
|
||||
<li><a href="../tortoise/tortoise-win.htm">Installing TortoiseHg and PuTTy on Windows</a>.</li>
|
||||
<li><a href="../tortoise/putty.html">Installing PuTTy on Windows</a>.</li>
|
||||
|
||||
<li><a href="../fzconfig.html">Installing Filezilla</a>.</li>
|
||||
|
||||
<li><a href="https://tortoisehg.readthedocs.io/en/latest/quick.html">Quick Start guide to TortoiseHg</a>.
|
||||
</ul>
|
||||
<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="manual.html#quickstart">exceptionally careful when using rsync</a>.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user