From e7491f6c60c84bec8cee7a9bff9939373bdf0557 Mon Sep 17 00:00:00 2001 From: Wookey Date: Wed, 22 Apr 2020 01:39:14 +0100 Subject: [PATCH] Update repository URLs and checkout info now expoweb is in git --- handbook/computing/manual.html | 19 ++++++++++--------- handbook/computing/qstart-git.html | 7 +++++-- handbook/tortoise/tortoise-win.htm | 10 +++++----- handbook/website-history.html | 10 +++++----- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/handbook/computing/manual.html b/handbook/computing/manual.html index d10808d29..6bd5f84ef 100644 --- a/handbook/computing/manual.html +++ b/handbook/computing/manual.html @@ -53,10 +53,10 @@ processes that a maintainer would want to do.

Version control system

We use a distributed revision control system (git, and formerly mercurial) for all the important data. (Note that we just use git: not GitHub, not GitLab, just git.) 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.

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.

-

In 2019 we had half our version-controlled repositories under mercurial and half under git. -The intention is to move entirely to git before the 2020 expo. +

From 2012-2019 we used mercurial (aka 'hg'), but completed the move to git +before the 2020 expo.

+

Contents

    @@ -112,12 +113,12 @@ editing and keeps track of all changes so we can roll back and have branches if

    The site has been split into four parts:

    -

    We have migrated two of these to git but the other two still use mercurial. +

    We have migrated three of these to git but loser is still mercurial for a few more days.

    Updating cave pages

    diff --git a/handbook/computing/qstart-git.html b/handbook/computing/qstart-git.html index 2dbca1bdd..eb3b4b727 100644 --- a/handbook/computing/qstart-git.html +++ b/handbook/computing/qstart-git.html @@ -22,7 +22,7 @@ have key-pair setup already set up before any of

    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.

    -
    expoweb (The data management system) - this will fail until it is moved from hg to git
    +
    expoweb (The website/data management system)
    git clone ssh://expo@expo.survex.com:/home/expo/expoweb (read/write)
    @@ -42,6 +42,9 @@ have key-pair setup already set up before any of git clone ssh://expo@expo.survex.com:/home/expo/drawings (read/write)
    + +

    The repositories are browseable at http://expo.survex.com/repositories/

    +

    Using git in Windows

    @@ -59,7 +62,7 @@ have key-pair setup already set up before any of

    git commit (you can specify filenames to be specific)

    -

    The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage. +

    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 https://www.chiark.greenend.org.uk/~sgtatham/putty/), 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.

    diff --git a/handbook/tortoise/tortoise-win.htm b/handbook/tortoise/tortoise-win.htm index 0a48134a0..c29f9f5f5 100644 --- a/handbook/tortoise/tortoise-win.htm +++ b/handbook/tortoise/tortoise-win.htm @@ -63,7 +63,7 @@ To log out of PuTTy, type 'logout', then press the return/enter key.

    Hg Workbench

    Hg Workbench

    -

    At which point type ssh://expo@expo.survex.com/loser into +

    At which point type ssh://expo@expo.survex.com/repositories/hg/loser 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:

    > diff --git a/handbook/website-history.html b/handbook/website-history.html index aa51ccbeb..66a9d46c0 100644 --- a/handbook/website-history.html +++ b/handbook/website-history.html @@ -133,13 +133,13 @@ university since Feb 2014.

    2018

    -

    In 2018 we had 4 repositories: +

    In 2018 we had 4 repositories, 2 mercurial, 2 git

    In spring 2018 Sam, Wookey and Paul Fox updated the Linux version and the Django version (i.e. troggle) to