Jump to content

Infrastructure/Git: Difference between revisions

From KDE Community Wiki
Ochurlaud (talk | contribs)
Tgilgien (talk | contribs)
m remove dead link
 
(28 intermediate revisions by 14 users not shown)
Line 1: Line 1:
[[Category:Needs Attention]]<languages />
[[Category:Needs Attention]]
<translate>
 
<!--T:1-->
This is the hub page for all information about the use of Git by KDE.
This is the hub page for all information about the use of Git by KDE.


This section provides details on using the KDE Git infrastructure.  This is intended for use by KDE developers to find out how KDE uses Git and how to set up Git for use with KDE.
This section provides details on using the KDE Git infrastructure.  This is intended for use by KDE developers to find out how KDE uses Git and how to set up Git for use with KDE.


== Git at KDE ==
== Git at KDE ==
Line 12: Line 10:
=== Anonymous access ===
=== Anonymous access ===


Both Git and Subversion repositories can be accessed anonymously by anyone. This access takes place from <code>anongit.kde.org</code> and <code>anonsvn.kde.org</code> for Git and Subversion respectively, and grants read only access to the same repositories which are available to contributors with developer accounts.
Both Git and Subversion repositories can be accessed anonymously by anyone. This access takes place from https://invent.kde.org/ and <code>anonsvn.kde.org</code> for Git and Subversion respectively, and grants read-only access to the same repositories which are available to contributors with developer accounts.
 
For Git, it is possible to perform clones and fetches over either the Git or HTTP protocols, depending on your situation. Access over HTTP is usually necessary when you are behind a restrictive network firewall. If your network access is unreliable, then you may want to download an archive of the repository instead, which you can freely resume the download of, as well as commit to and update later by using the usual git commands. These archives can be accessed at <code>https://anongit.kde.org/&lt;repository&gt;/&lt;repository&gt;-latest.tar.gz</code>.


KDE also maintains a mirror of its mainline Git repositories on [https://github.com/kde/ GitHub]. This mirror is read-only, and disables all of GitHub's additional features, such as issues, the wiki, and downloads, in favour of KDE's own hosted services. Additionally, pull requests on these repositories are not accepted, but code changes can always be accepted through KDE's code-review services.
KDE also maintains a mirror of its mainline Git repositories on [https://github.com/kde/ GitHub]. This mirror is read-only, and disables all of GitHub's additional features, such as issues, the wiki, and downloads, in favour of KDE's own hosted services. Additionally, pull requests on these repositories are not accepted. Code changes should use the official KDE git repositories https://invent.kde.org/. And still, GitHub may be used / searched more intuitively than the alternatives. E.g. sign into github.com, then search for source code in the entire "KDE" organization with a URL such as https://github.com/search?q=org%3AKDE+KMessageBox Then click on "Code" or "Commits".  


For Subversion, access is only provided over the Subversion protocol. If you are behind a restrictive firewall and need to access the KDE Subversion repository anonymously (and have no other means of network access), please file a [https://go.kde.org/u/systickets ticket].
For Subversion, access is only provided over the Subversion protocol. If you are behind a restrictive firewall and need to access the KDE Subversion repository anonymously (and have no other means of network access), please file a [https://go.kde.org/u/systickets ticket].
Line 24: Line 20:
Push or commit access to all KDE code repositories is open to any holder of a KDE developer account, subject to few limitations. This model allows contributors to easily make contributions to all parts of KDE without needing further approval. All commits made to either Git or Subversion are subject to commit hooks which will perform a few quality control checks and can take other actions on behalf of the developer. In the case of both Git and Subversion it is only possible to commit over SSH.
Push or commit access to all KDE code repositories is open to any holder of a KDE developer account, subject to few limitations. This model allows contributors to easily make contributions to all parts of KDE without needing further approval. All commits made to either Git or Subversion are subject to commit hooks which will perform a few quality control checks and can take other actions on behalf of the developer. In the case of both Git and Subversion it is only possible to commit over SSH.


With KDE Git, it is recommended to use a shortcut to access repositories instead of directly cloning them from the Git server itself. This shortcut allows you to use a local mirror of the repositories, and should improve response times. To setup a <code>kde:</code> shortcut, you should add the following configuration block to <code>~/.gitconfig</code>. If your network blocks the Git protocol, then you can exchange that for HTTP instead.
With KDE Git, it is recommended to use a shortcut to access repositories instead of directly cloning them from the Git server itself. This shortcut allows you to use a local mirror of the repositories, and should improve response times. To setup a <code>kde:</code> shortcut, you should add the following configuration block to <code>~/.config/git/config</code>. If your network blocks the Git protocol, then you can exchange that for HTTP instead.


<pre>[url &quot;git://anongit.kde.org/&quot;]
<pre>[url &quot;https://invent.kde.org/&quot;]
     insteadOf = kde:
     insteadOf = kde:
[url &quot;git@git.kde.org:&quot;]
[url &quot;git@invent.kde.org:&quot;]
     pushInsteadOf = kde:</pre>
     pushInsteadOf = kde:</pre>
Once setup as above, you can clone and push to repositories through the URL <code>kde:repository</code>.
Once setup as above, you can clone and push to repositories through the URL <code>kde:group/repository</code>.


As Subversion requires that checkouts you are committing from are made from the same location you are committing to, checkouts should be made from the Subversion server directly. It can be accessed at <code>svn+ssh://[email protected]/home/kde/</code>. If you have existing checkouts, you will need to relocate them using the <code>svn switch</code> command before you are able to commit.
As Subversion requires that checkouts you are committing from are made from the same location you are committing to, checkouts should be made from the Subversion server directly. It can be accessed at <code>svn+ssh://[email protected]/home/kde/</code>. If you have existing checkouts, you will need to relocate them using the <code>svn switch</code> command before you are able to commit.
Line 38: Line 34:
To allow for quick review of code, web repository browsers exist for both Git and Subversion repositories. Those interested in browsing Subversion should visit [https://websvn.kde.org/ WebSVN], which will contain the latest commits made to the KDE Subversion repository subject to a delay of 10 minutes at maximum.
To allow for quick review of code, web repository browsers exist for both Git and Subversion repositories. Those interested in browsing Subversion should visit [https://websvn.kde.org/ WebSVN], which will contain the latest commits made to the KDE Subversion repository subject to a delay of 10 minutes at maximum.


In the case of Git, repository browsing is available via [https://quickgit.kde.org/ QuickGit]. Additionally, all mainline repositories are available on [https://github.com/kde GitHub] and can be browsed there. Please note that scratch and clone repositories are only browsable on Quickgit.
In the case of Git, repository browsing is available via [https://invent.kde.org/ GitLab]. Additionally, all mainline repositories are available on [https://github.com/kde GitHub] and can be browsed there. Please note that personal repositories are only browsable on our GitLab, they are not mirrored to GitHub.


If you need to link to materials which are stored in either Git or Subversion repositories on KDE infrastructure, it is requested that you do not embed the content directly, but simply link to it. Embedding content causes significantly higher load on the repository browser servers, making it unavailable for others wishing to use it. This is particularly relevant for blog posts on Planet or any other high traffic web page.
If you need to link to materials which are stored in either Git or Subversion repositories on KDE infrastructure, it is requested that you do not embed the content directly, but simply link to it. Embedding content, such as images, causes significantly higher load on the repository browser servers, making it unavailable for others wishing to use it. This is particularly relevant for blog posts on Planet or any other high traffic web page.


=== New repositories ===
=== New repositories ===


To allow for free form development in a manner similar to Subversion did, KDE Git allows personal repositories to be created on demand as needed. Two types of personal repository are available:
To allow for free form development in a manner similar to Subversion did, KDE Git allows personal repositories to be created on demand as needed. You can [https://invent.kde.org/projects/new create personal repositories] from the GitLab web interface. You can also "fork" an existing official KDE repository.
 
Scratch repositories are created on the fly when a developer pushes to them for the first time, and exist at <code>scratch/username/myRepo</code>. These are recommended for new development work.


Clone repositories are created by cloning an existing project repository, and exist at <code>clones/project/username/myClone</code>. They are created by running <code>ssh [email protected] clone project myClone</code> where <code>myClone</code> is the name you wish to call your clone, and <code>project</code> is the name of the repository you are cloning.
Personal repositories and forks can be deleted at any time.


Personal repositories can be deleted at any time.
From time to time it may be necessary to create new project repositories, to contain newly developed applications, migrate existing applications from Subversion or to bring new projects under the KDE umbrella. New repositories can be requested by filing a [https://go.kde.org/u/systickets ticket], and will be created in the appropriate group on invent.kde.org.
 
From time to time it may be necessary to create new project repositories, to contain newly developed applications, migrate existing applications from Subversion or to bring new projects under the KDE umbrella. New repositories can be requested by filing a [https://go.kde.org/u/systickets ticket], and will usually be created at the top level on <code>git.kde.org</code>.


=== Extra Karma ===
=== Extra Karma ===
Line 62: Line 54:
A complete manual on how to use KDE's Git services, along with some best practices, is available on the [http://community.kde.org/Sysadmin/GitKdeOrgManual KDE Community Wiki].
A complete manual on how to use KDE's Git services, along with some best practices, is available on the [http://community.kde.org/Sysadmin/GitKdeOrgManual KDE Community Wiki].


Server Fingerprints<br />
=== Hooks ===
Kde provides some [[/Hooks |git hooks]] to perform and automatize some actions on push.
 
=== Server Fingerprints ===
The SSH host server key fingerprints are as follows for both Git and Subversion access:
The SSH host server key fingerprints are as follows for both Git and Subversion access:


* '''RSA''': <code>51:d4:83:0d:47:da:da:03:fc:b7:81:67:5e:48:fe:1a</code>
* '''ED25519-256 (SHA256)''': <code>zHdK2R/S6s5Oj71N0s8LHWCXXsUt+DCztd+GjzW9KlU</code>
* '''DSA''': <code>f0:0d:c0:3e:be:0b:52:30:42:17:6b:40:21:94:04:d2</code>
* '''ECDSA-256 (SHA256)''': <code>ZNBg4AkRxbt/N6xzpt7GbmmS78A3WFy5lz0l/cPHbcE</code>
* '''ECDSA''': <code>fe:0d:d6:6e:85:1b:8d:3d:45:a7:94:e0:0c:88:65:fb</code>
* '''RSA-3072 (SHA256)''': <code>KxAoV6VsbKvAocFZCJlxtmPDScmUCRNiUiOCSXNSC/k</code>


== KDE and Git (to merge with the above text) == <!--T:3-->
([https://mail.kde.org/pipermail/kde-devel/2023-July/001895.html Changed July 23, 2023])


The [http://community.kde.org/Sysadmin/GitKdeOrgManual KDE Git System Administrators Manual] is a useful resource for more details on the technical implementation of the KDE Git infrastructure.
== Resources ==
 
Links to useful external sites about Git
 
=== Official Documentation ===
 
* [http://git-scm.com/documentation Links to git official documentation]
 
=== Git books ===
 
* [http://progit.org/book/ Pro Git] - An easy to understand book on git (CC licensed).


<!--T:91-->
* [http://book.git-scm.com/ The git community book], also as a [http://book.git-scm.com/book.pdf pdf]
For more information on how the KDE Git Repositories are organized, please see the [[Guidelines_and_HOWTOs/Build_from_source|Sources]] page or the [https://quickgit.kde.org KDE Git Projects] page.


<!--T:92-->
=== Tutorials ===
Please note that some KDE modules are still using SVN, for more details read the [[Infrastructure/Subversion|Using Subversion with KDE]] page.


=== KDE Git Configuration === <!--T:6-->
* [http://www-cs-students.stanford.edu/~blynn/gitmagic/ Git Magic] - A good intro to git (in several languages!)


<!--T:7-->
*[http://tom.preston-werner.com/2009/05/19/the-git-parable.html The Git Parable]
How to configure Git for use with the KDE infrastructure.


<!--T:8-->
* [http://try.github.io/ tryGit] A 15 minute online interactive tutorial
Please see the [[Special:myLanguage/Infrastructure/Git/Configuration|Git Configuration page]].


=== KDE Git Policies === <!--T:10-->
=== KDE's Git Infrastructure ===


<!--T:11-->
The [http://community.kde.org/Sysadmin/GitKdeOrgManual KDE Git System Administrators Manual] is a useful resource for more details on the technical implementation of the KDE Git infrastructure.
KDE policies on Git.  More generic development policies go elsewhere.


<!--T:93-->
For more information on how the KDE Git Repositories are organized, please see the [[Guidelines_and_HOWTOs/Build_from_source|Build from source]] page.
No formal workflow policy currently exists, but a number of draft proposals have been made:
* [[/Simple Workflow/]]
* [[/Feature Branch Workflow/]]
* [[Infrastructure/Tutorials/Git/Feature Development Workflow|Feature Development Workflow]]
* [http://community.kde.org/Frameworks/Git_Workflow Git Workflow on the Community Wiki]


<!--T:94-->
Other:
Other:
* The new [[Policies/Commit Policy|Commit Policy]] is being reviewed, applied to both SVN and Git.
* The new [[Policies/Commit Policy|Commit Policy]] is being reviewed, applied to both SVN and Git.
* [[/GitHub Mirror/]] has been created and policy is in development (Sep 2015).
* [[/GitHub Mirror/]] has been created and policy is in development (Sep 2015).


=== KDE Git Recipes === <!--T:12-->
=== KDE Git Recipes ===


<!--T:13-->
Short recipes for using Git with the KDE infrastructure.
Short recipes for using Git with the KDE infrastructure.


<!--T:14-->
Please see the [[Special:myLanguage/Infrastructure/Git/Recipes|Git Recipes page]].
Please see the [[Special:myLanguage/Infrastructure/Git/Recipes|Git Recipes page]].


=== KDE Git Tutorials === <!--T:16-->
=== KDE Git Tutorials ===


<!--T:17-->
More in-depth instructions in using Git.
More in-depth instructions in using Git.


<!--T:18-->
* [[Special:myLanguage/Infrastructure/Tutorials/Git/GitQuickStart|A quick step-by-step guide for getting started]]
* [[Special:myLanguage/Infrastructure/Tutorials/Git/GitQuickStart|A quick step-by-step guide for getting started]]


<!--T:19-->
* [[Special:myLanguage/Infrastructure/Tutorials/Git/Create a patch|Creating a patch]]
* [[Special:myLanguage/Infrastructure/Tutorials/Git/Create a patch|Creating a patch]]


<!--T:20-->
Please help filling this section by
Please help filling this section by
* checking the links at the bottom of the page and see which still have valid content
* checking the links at the bottom of the page and see which still have valid content
* write tutorials yourself
* write tutorials yourself


== External Git Resources == <!--T:21-->
=== Cheat Sheets ===
 
<!--T:22-->
Links to useful external sites about Git
 
=== Official Documentation === <!--T:23-->
 
<!--T:24-->
* [http://git-scm.com/documentation Links to git official documentation]
 
=== Git for SVN Users === <!--T:25-->
 
<!--T:26-->
* [http://git-scm.com/course/svn.html The git-svn Crash Course]
 
=== Git books === <!--T:27-->
 
<!--T:28-->
* [http://progit.org/book/ Pro Git] - An easy to understand book on git (CC licensed).
 
<!--T:30-->
* [http://book.git-scm.com/ The git community book], also as a [http://book.git-scm.com/book.pdf pdf]
 
=== Tutorials === <!--T:32-->
 
<!--T:33-->
* [http://www-cs-students.stanford.edu/~blynn/gitmagic/ Git Magic] - A good intro to git (in several languages!)
 
<!--T:35-->
*[http://tom.preston-werner.com/2009/05/19/the-git-parable.html The Git Parable]
- Essential reading if you want to truly understand git.
 
<!--T:37-->
* [http://www.gitcasts.com/ Git Screencasts]
 
<!--T:95-->
* [http://try.github.io/ tryGit] A 15 minute online interactive tutorial
 
=== Cheat Sheets === <!--T:38-->
 
<!--T:39-->
* [http://cheat.errtheblog.com/s/git Quick reference]


<!--T:40-->
* [[Media:Zrusin-git-cheat-sheet-medium.png|Illustrated git cheat sheet]]
* [http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html Illustrated git cheat sheet]  
* [https://cheat.errtheblog.com/s/git Old quick reference]
(broken image, get it from [[Media:Zrusin-git-cheat-sheet-medium.png]])
</translate>

Latest revision as of 11:52, 21 February 2024


This is the hub page for all information about the use of Git by KDE.

This section provides details on using the KDE Git infrastructure. This is intended for use by KDE developers to find out how KDE uses Git and how to set up Git for use with KDE.

Git at KDE

KDE currently offers code hosting using Git. Additionally, KDE also maintains a limited Subversion infrastructure for certain special projects, such as translations and older websites.

Anonymous access

Both Git and Subversion repositories can be accessed anonymously by anyone. This access takes place from https://invent.kde.org/ and anonsvn.kde.org for Git and Subversion respectively, and grants read-only access to the same repositories which are available to contributors with developer accounts.

KDE also maintains a mirror of its mainline Git repositories on GitHub. This mirror is read-only, and disables all of GitHub's additional features, such as issues, the wiki, and downloads, in favour of KDE's own hosted services. Additionally, pull requests on these repositories are not accepted. Code changes should use the official KDE git repositories https://invent.kde.org/. And still, GitHub may be used / searched more intuitively than the alternatives. E.g. sign into github.com, then search for source code in the entire "KDE" organization with a URL such as https://github.com/search?q=org%3AKDE+KMessageBox Then click on "Code" or "Commits".

For Subversion, access is only provided over the Subversion protocol. If you are behind a restrictive firewall and need to access the KDE Subversion repository anonymously (and have no other means of network access), please file a ticket.

Pushing

Push or commit access to all KDE code repositories is open to any holder of a KDE developer account, subject to few limitations. This model allows contributors to easily make contributions to all parts of KDE without needing further approval. All commits made to either Git or Subversion are subject to commit hooks which will perform a few quality control checks and can take other actions on behalf of the developer. In the case of both Git and Subversion it is only possible to commit over SSH.

With KDE Git, it is recommended to use a shortcut to access repositories instead of directly cloning them from the Git server itself. This shortcut allows you to use a local mirror of the repositories, and should improve response times. To setup a kde: shortcut, you should add the following configuration block to ~/.config/git/config. If your network blocks the Git protocol, then you can exchange that for HTTP instead.

[url "https://invent.kde.org/"]
    insteadOf = kde:
[url "[email protected]:"]
    pushInsteadOf = kde:

Once setup as above, you can clone and push to repositories through the URL kde:group/repository.

As Subversion requires that checkouts you are committing from are made from the same location you are committing to, checkouts should be made from the Subversion server directly. It can be accessed at svn+ssh://[email protected]/home/kde/. If you have existing checkouts, you will need to relocate them using the svn switch command before you are able to commit.

Browsing

To allow for quick review of code, web repository browsers exist for both Git and Subversion repositories. Those interested in browsing Subversion should visit WebSVN, which will contain the latest commits made to the KDE Subversion repository subject to a delay of 10 minutes at maximum.

In the case of Git, repository browsing is available via GitLab. Additionally, all mainline repositories are available on GitHub and can be browsed there. Please note that personal repositories are only browsable on our GitLab, they are not mirrored to GitHub.

If you need to link to materials which are stored in either Git or Subversion repositories on KDE infrastructure, it is requested that you do not embed the content directly, but simply link to it. Embedding content, such as images, causes significantly higher load on the repository browser servers, making it unavailable for others wishing to use it. This is particularly relevant for blog posts on Planet or any other high traffic web page.

New repositories

To allow for free form development in a manner similar to Subversion did, KDE Git allows personal repositories to be created on demand as needed. You can create personal repositories from the GitLab web interface. You can also "fork" an existing official KDE repository.

Personal repositories and forks can be deleted at any time.

From time to time it may be necessary to create new project repositories, to contain newly developed applications, migrate existing applications from Subversion or to bring new projects under the KDE umbrella. New repositories can be requested by filing a ticket, and will be created in the appropriate group on invent.kde.org.

Extra Karma

At times contributors may find it necessary to push or commit to certain repositories or paths which are protected. In this case the server will reject your request with a message such as insufficient karma or access denied. This protection is most often applied to repositories which run parts of the infrastructure such as websites or other crucial components.

If you would like to request access to these protected areas, please file a ticket, mentioning which repositories or paths you are trying to change.

A complete manual on how to use KDE's Git services, along with some best practices, is available on the KDE Community Wiki.

Hooks

Kde provides some git hooks to perform and automatize some actions on push.

Server Fingerprints

The SSH host server key fingerprints are as follows for both Git and Subversion access:

  • ED25519-256 (SHA256): zHdK2R/S6s5Oj71N0s8LHWCXXsUt+DCztd+GjzW9KlU
  • ECDSA-256 (SHA256): ZNBg4AkRxbt/N6xzpt7GbmmS78A3WFy5lz0l/cPHbcE
  • RSA-3072 (SHA256): KxAoV6VsbKvAocFZCJlxtmPDScmUCRNiUiOCSXNSC/k

(Changed July 23, 2023)

Resources

Links to useful external sites about Git

Official Documentation

Git books

  • Pro Git - An easy to understand book on git (CC licensed).

Tutorials

  • Git Magic - A good intro to git (in several languages!)
  • tryGit A 15 minute online interactive tutorial

KDE's Git Infrastructure

The KDE Git System Administrators Manual is a useful resource for more details on the technical implementation of the KDE Git infrastructure.

For more information on how the KDE Git Repositories are organized, please see the Build from source page.

Other:

  • The new Commit Policy is being reviewed, applied to both SVN and Git.
  • GitHub Mirror has been created and policy is in development (Sep 2015).

KDE Git Recipes

Short recipes for using Git with the KDE infrastructure.

Please see the Git Recipes page.

KDE Git Tutorials

More in-depth instructions in using Git.

Please help filling this section by

  • checking the links at the bottom of the page and see which still have valid content
  • write tutorials yourself

Cheat Sheets