This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
wiki:development:git [2011/10/17 18:49] h1 Page moved from git to wiki:git |
wiki:development:git [2013/03/14 23:30] sunweaver |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | ====== | + | ====== |
- | Within the X2go project development code is shared via a public GIT repository hosted by DAS-NETZWERKTEAM in Kiel, Nothern Germany (Servers: Hetzner Online AG). For any technical | + | Within the X2Go project development code is shared via a public GIT repository hosted by DAS-NETZWERKTEAM in Kiel, Nothern Germany (Servers: Hetzner Online AG). For any technical |
===== Access ===== | ===== Access ===== | ||
- | ==== Browse the X2go GIT repository tree in a web browser ==== | + | ==== Browse the X2Go GIT repository tree in a web browser ==== |
Line 12: | Line 12: | ||
The Web service is also available as a https service. To make secure browsing as smooth as possible, please import this Root-CA-Certificate into your web browser: http:// | The Web service is also available as a https service. To make secure browsing as smooth as possible, please import this Root-CA-Certificate into your web browser: http:// | ||
- | ==== Anonymous | + | ==== Anonymous |
- | X2go's Git projects can be cloned to a local copy through anonymous Git with the following instruction set (in a Unix-like console session). | + | X2Go's Git projects can be cloned to a local copy through anonymous Git with the following instruction set (in a Unix-like console session). |
$ mkdir -p ~/x2go | $ mkdir -p ~/x2go | ||
Line 23: | Line 23: | ||
For < | For < | ||
- | ===== Contributing to X2go ===== | + | ===== Contributing to X2Go ===== |
Before you start contributing make sure git git knows who you are, as this is added to the patches. | Before you start contributing make sure git git knows who you are, as this is added to the patches. | ||
- | === Setup Git Configuration === | + | ==== Setup Git Configuration |
Now it is time to set up your system environment for working with Git. Main thing is to tell Git who you are. For this edit the file '' | Now it is time to set up your system environment for working with Git. Main thing is to tell Git who you are. For this edit the file '' | ||
Line 39: | Line 39: | ||
- | Only project developers can access | + | Only project developers can access |
- | < | ||
- | patches@x2go.org | + | ==== Developer Git Access via SSH ==== |
- | === Developer Git Access via SSH === | ||
- | + | In the instruction set below, substitute < | |
- | In the instruction set below, substitute < | + | |
$ cd ~/ | $ cd ~/ | ||
$ git push ssh:// | $ git push ssh:// | ||
- | === SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) === | + | ==== SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) |
| | ||
Line 60: | Line 57: | ||
===== Commits / Tags via e-Mail ===== | ===== Commits / Tags via e-Mail ===== | ||
- | Commits and tags in X2go Git are posted as e-Mails to two different mailing lists: | + | Commits and tags in X2Go Git are posted as e-Mails to two different mailing lists: |
* Git commits -> x2go-commits@lists.berlios.de (https:// | * Git commits -> x2go-commits@lists.berlios.de (https:// | ||
- | * Git tags -> x2go-announcement@lists.berlios.de (https:// | + | * Git tags -> x2go-tags@lists.berlios.de (https:// |
- | These mailing lists can be subscribed to by anyone who is interested in X2go Git changes. However, beware that there might be phases you get flooded by mails, if you subscribe to any of these lists (esp. x2go-commits). Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service. | + | These mailing lists can be subscribed to by anyone who is interested in X2Go Git changes. However, beware that there might be phases |
Both mailing lists are also archived at Gmane: | Both mailing lists are also archived at Gmane: | ||
- | * [[http:// | + | * [[http:// |
- | * [[http:// | + | * [[http:// |
===== Snippets ==== | ===== Snippets ==== | ||
- | ==== Checkout all repos: ==== | + | ==== Checkout all repos ==== |
- | This is for bash | + | Just copy and paste into a bash terminal: |
< | < | ||
for REP in \ | for REP in \ | ||
buildscripts.git \ | buildscripts.git \ | ||
cups-x2go.git \ | cups-x2go.git \ | ||
+ | libjpeg-turbo.git \ | ||
+ | libpam-x2go.git \ | ||
+ | lightdm-remote-session-x2go.git \ | ||
ltsp-pyhocathinclient.git \ | ltsp-pyhocathinclient.git \ | ||
- | nxcomp.git \ | + | nx-libs.git \ |
- | nxcompext.git \ | + | |
- | nxcompshad.git \ | + | |
- | nxproxy.git \ | + | |
pinentry-x2go.git \ | pinentry-x2go.git \ | ||
pyhoca-cli.git \ | pyhoca-cli.git \ | ||
pyhoca-contrib.git \ | pyhoca-contrib.git \ | ||
pyhoca-gui.git \ | pyhoca-gui.git \ | ||
+ | python-paramiko.git \ | ||
python-x2go.git \ | python-x2go.git \ | ||
x2go-keyring.git \ | x2go-keyring.git \ | ||
- | x2goagent.git \ | + | x2goadmincenter.git \ |
+ | x2gobroker.git \ | ||
x2goclient-contrib.git \ | x2goclient-contrib.git \ | ||
x2goclient.git \ | x2goclient.git \ | ||
+ | x2goclient2.git \ | ||
+ | x2godesktop-applet.git \ | ||
x2godesktopsharing.git \ | x2godesktopsharing.git \ | ||
x2gognomebindings.git \ | x2gognomebindings.git \ | ||
+ | x2golxdebindings.git \ | ||
x2goplasmabindings.git \ | x2goplasmabindings.git \ | ||
x2goserver.git \ | x2goserver.git \ | ||
x2gothinclient.git \ | x2gothinclient.git \ | ||
x2gotrinitybindings.git \ | x2gotrinitybindings.git \ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
; do git clone git:// | ; do git clone git:// | ||
</ | </ | ||
+ | ==== Get Updates for all Repos ==== | ||
+ | Just copy and paste into a bash terminal: | ||
+ | < | ||
+ | for REP in \ | ||
+ | buildscripts \ | ||
+ | cups-x2go \ | ||
+ | libjpeg-turbo \ | ||
+ | libpam-x2go \ | ||
+ | lightdm-remote-session-x2go \ | ||
+ | ltsp-pyhocathinclient \ | ||
+ | nx-libs \ | ||
+ | pinentry-x2go \ | ||
+ | pyhoca-cli \ | ||
+ | pyhoca-contrib \ | ||
+ | pyhoca-gui \ | ||
+ | python-paramiko \ | ||
+ | python-x2go \ | ||
+ | x2go-keyring \ | ||
+ | x2goadmincenter \ | ||
+ | x2gobroker \ | ||
+ | x2goclient-contrib \ | ||
+ | x2goclient \ | ||
+ | x2goclient2 \ | ||
+ | x2godesktop-applet \ | ||
+ | x2godesktopsharing \ | ||
+ | x2gognomebindings \ | ||
+ | x2golxdebindings \ | ||
+ | x2goplasmabindings \ | ||
+ | x2goserver \ | ||
+ | x2gothinclient \ | ||
+ | x2gotrinitybindings \ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | z99.ubuntu/ | ||
+ | ; do cd $REP && git pull && cd .. ; done | ||
+ | </ | ||
===== Maintenance ===== | ===== Maintenance ===== | ||
- | <note warning> | + | <note warning> |
- | ==== Create new Git Project on X2go Git ==== | + | ==== Create new Git Project on X2Go Git ==== |
Create a local Git project: | Create a local Git project: | ||
Line 131: | Line 177: | ||
</ | </ | ||
- | Now you can start working on your new X2go project as on any of the other already existing | + | Now you can start working on your new X2Go project as on any of the other already existing |
==== Edit Git Configs ==== | ==== Edit Git Configs ==== | ||
Line 157: | Line 203: | ||
===== Backyard ===== | ===== Backyard ===== | ||
- | |||
- | < | ||
==== Reverting Merge Commits ==== | ==== Reverting Merge Commits ==== | ||
Line 164: | Line 208: | ||
If you forget to run '' | If you forget to run '' | ||
- | There is nothing bad about merge commits apart from the fact that the X2go Git system won't allow them being pushed to the server :-/. | + | There is nothing bad about merge commits apart from the fact that the X2Go Git system won't allow them being pushed to the server :-/. |
Thus, you probably want to avoid merge commits right from the beginning. However, from time to time it occurs that you crunch your Git log with a merge commit. This is how such a thing can happen: | Thus, you probably want to avoid merge commits right from the beginning. However, from time to time it occurs that you crunch your Git log with a merge commit. This is how such a thing can happen: | ||
Line 170: | Line 214: | ||
* change a file | * change a file | ||
* commit it locally | * commit it locally | ||
- | * push it to X2go Git | + | * push it to X2Go Git |
* find that the push operation gets rejected :-( | * find that the push operation gets rejected :-( | ||
* then run '' | * then run '' | ||
Line 200: | Line 244: | ||
</ | </ | ||
- | ==== Pushing to X2go Git ==== | + | ==== Pushing to X2Go Git ==== |
- | Whenever your local X2go Git project is in an acceptable state for the community, feel free to push the code to the X2go Git server: | + | Whenever your local X2Go Git project is in an acceptable state for the community, feel free to push the code to the X2Go Git server: |
< | < | ||
Line 214: | Line 258: | ||
</ | </ | ||
- | The update scripts of X2go Git will shout warnings at you while pushing. These warnings relate to | + | The update scripts of X2Go Git will shout warnings at you while pushing. These warnings relate to |
* whitespaces found at the end of lines | * whitespaces found at the end of lines |