# -*- mode: org -*-
#+TITLE:     Git and GitLab
#+AUTHOR:    Arnaud Legrand
#+DATE: June, 2018
#+STARTUP: overview indent
#+OPTIONS: num:nil toc:t
#+PROPERTY: header-args :eval never-export

*This document is particularly important if you follow the Rstudio or
the Org-Mode course.* *If you follow the Jupyter course, it can be
ignored in a first step* *as we have closely integrated Jupyter and
GitLab in the context of this MOOC.*

So far, you only used git via the web interface from the GitLab we
deployed for the MOOC: https://app-learninglab.inria.fr/gitlab/

If you access this link from the FUN platform, you do not have to
authenticate and you can readily read and modify all your files.  This
is very convenient but in most cases, you will want to have your own
local copy of the repository and you will have to synchronize your
local copy with the remote GitLab one. To propagate your
modifications, you will obviously have to authenticate yourself on
GitLab. 

This document describes the software you need to have installed on
your machine and how to handle authentication.  The "Configuring Git"
section is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/7508aece244548349424dfd61ee3ba85][video tutorial]] (in French).

Please read all these instructions carefully, in particular the one on
"Configuring your password on GitLab".

* Installing Git
** Linux (debian, ubuntu)
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
for other distributions (e.g., redhat, fedora).

Run (as root):
#+begin_src sh :results output :exports both
apt-get update ; apt-get install git
#+end_src
** Mac OSX and Windows
- Download and install Git from the [[https://git-scm.com/downloads][Git website]].
- Optional Git clients (should not be needed if you work within
  Rstudio):
  - [[https://www.sourcetreeapp.com/][SourceTree]]
  - [[https://desktop.github.com/][GitHub Desktop]] 
    #+BEGIN_QUOTE
    [[https://github.com/desktop/desktop/issues/852][Apparently]], this works with GitLab and https.
    #+END_QUOTE
* Configuring Git
** Telling Git who you are: Name and Email
1. Open Terminal.
2. Set a Git username and email:
   #+begin_src shell :results output :exports both
   git config --global user.name "Mona Lisa"
   git config --global user.email "email@example.com"
   #+end_src

   #+RESULTS:

3. Confirm that you have set the Git username correctly:   
   #+begin_src shell :results output :exports both
   git config --global user.name
   git config --global user.email
   #+end_src

   #+RESULTS:
   : Mona Lisa
   : email@example.com
** Dealing with proxies
You may be behind a proxy, in which case you may have trouble cloning
or fetching from a remote repository or you may get an error like
=unable to access ... Couldn't resolve host ...=

In such case, consider something like this:
#+begin_src shell :results output :exports both
git config --global http.proxy http://proxyUsername:proxyPassword@proxy.server.com:port
#+end_src

The proxyPassword will be stored unencrypted in your ~.gitconfig~ file,
which you may not want. In that case, remove it from the URL and you
will be prompted for it every time it is needed.
** Getting and changing the default password on GitLab
*Warning (Jupyter users) :* changing your default Gitlab password will prevent you from commiting in Jupyter. You will have to do the extra step of changing your Jupyter =~/.git-credentials=

1. Get your default password using the [[https://app-learninglab.inria.fr/jupyterhub/services/password][Gitlab credentials retrieval
   tool]] as described on the [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/7508aece244548349424dfd61ee3ba85][corresponding resource]].

   /Note: You have to access this webpage from the FUN platform
   otherwise you may get a 405 error/ /when trying to direcly open
   [[https://app-learninglab.inria.fr/jupyterhub/services/password]]./
   #+BEGIN_CENTER
   [[file:gitlab_images/erreur405.png]]
   #+END_CENTER
2. Access [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/xblock/block-v1:inria+41016+session01bis+type@lti+block@05a0ce425f1741e5bee5049040f70529/handler/preview_handler][GitLab]]. 

   /Note: Again, you have to access Gitlab from the FUN platform
   otherwise you may get a 405 error/ /when trying to direcly open
   https://app-learninglab.inria.fr/gitlab/users/sign_in/.
3. Click on =Sign in:= or using your default credentials
   #+BEGIN_CENTER
   [[file:gitlab_images/signin.png]]
   #+END_CENTER
   The long and uggly character sequence, which is here replaced by
   =xxx= is your GitLab login/id (it is the same as the one you obtained
   from Gitlab credentials retrieval tool). You'll need to use it when
   trying to propagate some modifications from your computer to
   GitLab.
4. Go to =Account > Settings > Password= and define your password using your default password :
   #+BEGIN_CENTER
   [[file:gitlab_images/password.png]]
   #+END_CENTER
** Remembering your password locally
If you clone your repos by simply pasting the GitLab URL, you will be
prompted for your login and your password every time you want to
propagate your local modifications, which is tedious. This is why you
should ask git to remember your login and password as follows
#+begin_src shell :results output :exports both
git config --global credential.helper cache                  # remember my password
git config --global credential.helper "cache --timeout=3600" # for one hour at most
#+end_src
With this setup, you will be prompted for your password but it will be
cached in memory and they will not be asked again before an hour.  You
may want to read [[https://stackoverflow.com/questions/5343068/is-there-a-way-to-skip-password-typing-when-using-https-on-github][these instructions]] to better understand how all this
works.
** Optional: authenticating through SSH
There are two ways of authenticating and synchronizing your local
repository with GitLab: through HTTPS or through SSH. The first one is
what was just described and does not require any particular software
installation on your machine so this is what I recommend for this
MOOC. Yet, I like the second one better (although is may seem a bit
more technical), which is why I describe it here. It consists in
installing SSH, creating a pair or private/public keys, and uploading
your SSH public key on GitLab. This section provides with information
on how to do this.
*** Installing SSH
**** Linux (debian, ubuntu)
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
for other distributions (e.g., redhat, fedora).

Run (as root):
#+begin_src sh :results output :exports both
apt-get update ; apt-get install openssh-client
#+end_src
**** Mac OSX
You do not have anything to do as it is installed by default.
**** Windows
You should install the [[https://www.ssh.com/ssh/putty/windows/][Putty]] client. Once it is installed, look for
the section on [[https://www.ssh.com/ssh/putty/windows/puttygen][generating an SSH key]].
*** Setting up SSH on GitLab
Here are [[https://docs.gitlab.com/ee/ssh/][all the official explanations on how to set up your SSH key
on GitLab]]. Alternatively, you may also want to have a look at this
video:
#+BEGIN_EXPORT html
<iframe width="560" height="315" src="https://www.youtube.com/embed/54mxyLo3Mqk" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
#+END_EXPORT
* Using Git through the command line to synchronize your local files with Gitlab
This section describes a generic (through the command line) way to
synchronize your local files with Gitlab. You will not need this if
you follow the Jupyter course. If you follow the Rstudio course, all
these operations can be done through Rstudio and you may want to read
[[file:rstudio.org][the corresponding instructions]]. If you follow the Org-Mode course, all
these operations can be done through Magit and you may want to read
[[file:emacs_orgmode.org][the corresponding instructions]]. 

Here are other ways to learn Git through the command line:
- The [[http://swcarpentry.github.io/git-novice/][Software Carpentry git tutorial]]
- The (freely available) Pro Git book ([[https://git-scm.com/book/en/v2][in English]] or [[https://git-scm.com/book/fr/v2][in
  French]]). Reading the first two chapters is enough to get a good start.
- [[https://learngitbranching.js.org/][Learn Git Branching]] will allow to interactively learn Git and to 
  understand with branches.

Now, let's start!
1. Obtain the repository URL
   [[file:gitlab_images/adresse_depot.png]]
2. Cloning the repository
   #+begin_src shell :results output :exports both
   cd /the/directory/where/you/want/to/clone/your/repository
   git clone https://app-learninglab.inria.fr/gitlab/xxx/mooc-rr.git
   #+end_src
   Alternatively, you may want to indicate now your login although I
   rather suggest you follow the /Remembering your password locally/
   instructions:
   #+begin_src shell :results output :exports both
   git clone https://xxx@app-learninglab.inria.fr/gitlab/xxx/mooc-rr.git
   #+end_src
   Now a directory =mooc-rr= has been created on your computer.
3. Inspect the repository
   #+begin_src shell :results output :exports both
   cd mooc-rr
   ls # (Unix)
   dir # (Windows)
   #+end_src
4. Synchronizing to GitLab

   You should indicate which files to track (=git add=) and commit them
   locally (=git commit=) before they can be transfered (=git push=) to
   GitLab. The =git status= will indicate you whether files are
   tracked/modified/committed/...

   Let's assume you just created a `fichier.txt` file on the top of
   the =mooc-rr= directory.

   #+begin_src shell :results output :exports both
   git status
   #+end_src

   [[file:gitlab_images/status1.png]]

   #+begin_src shell :results output :exports both
   git add fichier.txt
   git status
   #+end_src

   [[file:gitlab_images/status2.png]]

   #+begin_src shell :results output :exports both
   git commit -m "message commit"
   #+end_src

   [[file:gitlab_images/commit_git.png]]

   #+begin_src shell :results output :exports both
   git status
   #+end_src

   [[file:gitlab_images/status3.png]]

   The file can then be transfered to GitLab:
   #+begin_src shell :results output :exports both
   git push
   #+end_src

   At this point, git will as you about your login/password unless
   you followed the previous /Remembering your password locally/ instructions.

   N.B.: you will not be allowed to propagate your modifications to
   GitLab if other modifications (e.g., from someone else) have been
   propagated in between

   [[file:gitlab_images/rejected.png]]
5. Synchronizing from Gitlab: to avoid the previous problem, you need
   to fetch the remote GitLab modifications first and apply them
   locally.
   #+begin_src shell :results output :exports both
   git pull
   #+end_src
   Only then will you be able to =git push=.


