Project GIT Information - Revision history

imported>SlavekB: /* Using GIT */ Update instructions for cloning the entire repository tree

2019-08-07T16:35:45Z

Using GIT: Update instructions for cloning the entire repository tree

imported>SlavekB: Switch git clone url for mirror from CGit to Gitea

2018-06-01T14:06:38Z

Switch git clone url for mirror from CGit to Gitea

imported>SlavekB: Switch clone url for mirror to https

2018-03-11T17:55:40Z

Switch clone url for mirror to https

imported>SlavekB: Fix clone url for mirror

2015-12-03T02:21:19Z

Fix clone url for mirror

imported>SlavekB: Add information for clone from mirror

2015-12-03T02:19:07Z

Add information for clone from mirror

imported>TimothyPearson: Use GIT over HTTPS for security/authenticity

2014-07-07T22:29:08Z

Use GIT over HTTPS for security/authenticity

imported>Eliddell: Created page with "Category:Developers This page provides instructions regarding the project's GIT repositories ==What is GIT?== GIT, short for Global Information Tracker ([http://kerneltr..."

2014-05-02T21:15:46Z

Created page with "Category:Developers This page provides instructions regarding the project's GIT repositories ==What is GIT?== GIT, short for Global Information Tracker ([http://kerneltr..."

New page

[[Category:Developers]]
This page provides instructions regarding the project's GIT repositories

==What is GIT?==

GIT, short for Global Information Tracker ([http://kerneltrap.org/files/Jeremy/README among other things]) is a distributed version control system. It is the system in which the TDE code is stored, and allows multiple developers to work collaboratively without accidentally erasing each other's work. It also maintains a history of every single change that was ever made to the TDE source code.

Terms you will need to know:

'''Check out''': This is the act of retrieving an editable copy of the source code from our servers. Unless you are a TDE developer you will not be able to commit any changes you make to our servers, but you can generate patches containing your changes from the code you originally checked out.

'''Commit''': This is the act of uploading your modified source code to the project's server. When this occurs, your changes become part of the codebase that is being developed, and will therefore be accessible by anyone who downloads a copy of the source code.

'''Module''': A single GIT repository, in the context of the TDE project usually an application or library.

'''Submodule''': A module that resides within the directory structure of another module, and is version locked by the outer module. In the context of the TDE project, common build directories (admin/ and cmake/) are inserted as submodules into each application and library. This structure allows a change made to the submodule source code to be automatically propagated to all modules that use the submodule.

'''HEAD''': This is the latest version of the source code available, and therefore is the version that any changes will be applied to or differences will be calculated from. In most cases HEAD will be the latest version available on the TDE project's servers, however if you have made any local commits the last commit made will be used as HEAD.

==Using GIT==

===To check out the entire source tree===

====With GIT version < 1.6.5====

'''NOTE: ‘<username>@‘ should be removed from commands listed below if read-only anonymous (i.e. non-developer) access is desired.'''

<nowiki>git clone http://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
cd tde
git submodule init -- scripts
git submodule update -- scripts
./scripts/switch_all_submodules_to_head_and_clean

====With GIT version >= 1.6.5====

Due to the use of submodules, in order to checkout the TDE tree with GIT version >= 1.6.5 the ‘--recursive‘ option must be given:

<nowiki>git clone --recursive http://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>

'''NOTE: For public read-only access use "anonymous" as the username.'''

You may also wish to skip the numerous password prompts that will appear on first checkout; these two tasks can be accomplished with the following command:

<nowiki>GIT_ASKPASS=echo git clone --recursive http://anonymous@scm.trinitydesktop.org/scm/git/tde</nowiki>

===To check out a single project===

Find the project you are interested in on the public web interface

<nowiki>git clone http://<username>@scm.trinitydesktop.org/scm/git/<project name></nowiki>
cd <project name>
git submodule init
git submodule update

===To discard all local changes and update to the latest HEAD version===

cd <top level tde directory>
./scripts/switch_all_submodules_to_head_and_clean

===To nondestructively update the current repository to the latest HEAD version===

git pull

NOTE: This does NOT update supermodules or submodules of the current repository

===To commit all changes made to the complete source tree===

cd <top level tde directory>
./scripts/commit_all_submodules

===To commit changes in the current repository to the TDE servers===

git commit -a
git push origin HEAD

NOTE: This does NOT commit supermodules or submodules of the current repository

@@ Line 25: / Line 25: @@
  <nowiki>git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde</nowiki>
+ <nowiki>git clone https://mirror.git.trinitydesktop.org/gitea/TDE/scripts tde/scripts</nowiki>
  cd tde
- git submodule init -- scripts
- git submodule update -- scripts
  ./scripts/switch_all_submodules_to_head_and_clean anonymous
@@ Line 37: / Line 36: @@
  <nowiki>git clone https://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
+ <nowiki>git clone https://<username>@scm.trinitydesktop.org/scm/git/scripts tde/scripts</nowiki>
  cd tde
- git submodule init -- scripts
- git submodule update -- scripts
  ./scripts/switch_all_submodules_to_head_and_clean

@@ Line 24: / Line 24: @@
 '''NOTE: Mirror of GIT repository is used for read-only access (i.e. for non-developers). For pushing changes to GIT is needed to use master repository or setup separate url for pushing changes.'''
- <nowiki>git clone https://mirror.git.trinitydesktop.org/cgit/tde</nowiki>
+ <nowiki>git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde</nowiki>
  cd tde
  git submodule init -- scripts

@@ Line 24: / Line 24: @@
 '''NOTE: Mirror of GIT repository is used for read-only access (i.e. for non-developers). For pushing changes to GIT is needed to use master repository or setup separate url for pushing changes.'''
- <nowiki>git clone http://mirror.git.trinitydesktop.org/cgit/tde</nowiki>
+ <nowiki>git clone https://mirror.git.trinitydesktop.org/cgit/tde</nowiki>
  cd tde
  git submodule init -- scripts

@@ Line 24: / Line 24: @@
 '''NOTE: Mirror of GIT repository is used for read-only access (i.e. for non-developers). For pushing changes to GIT is needed to use master repository or setup separate url for pushing changes.'''
- <nowiki>git clone http://mirror.git.trinitydesktop.org/scm/git/tde</nowiki>
+ <nowiki>git clone http://mirror.git.trinitydesktop.org/cgit/tde</nowiki>
  cd tde
  git submodule init -- scripts

@@ Line 20: / Line 20: @@
 ==Using GIT==
-===To check out the entire source tree===
+===To check out the entire source tree from mirror===
+'''NOTE: Mirror of GIT repository is used for read-only access (i.e. for non-developers). For pushing changes to GIT is needed to use master repository or setup separate url for pushing changes.'''
+ <nowiki>git clone http://mirror.git.trinitydesktop.org/scm/git/tde</nowiki>
+ cd tde
+ git submodule init -- scripts
+ git submodule update -- scripts
+ ./scripts/switch_all_submodules_to_head_and_clean anonymous
+===To check out the entire source tree from master repository===
 ====With GIT version < 1.6.5====
@@ Line 60: / Line 70: @@
 ===To nondestructively update the current repository to the latest HEAD version===
- git pull
+ git pull --rebase
 NOTE: This does NOT update supermodules or submodules of the current repository

@@ Line 26: / Line 26: @@
 '''NOTE:  ‘<username>@‘  should be removed from commands listed below if read-only anonymous (i.e. non-developer) access is desired.'''
- <nowiki>git clone http://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
+ <nowiki>git clone https://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
  cd tde
  git submodule init -- scripts
@@ Line 36: / Line 36: @@
 Due to the use of submodules, in order to checkout the TDE tree with GIT version >= 1.6.5 the ‘--recursive‘ option must be given:
- <nowiki>git clone --recursive http://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
+ <nowiki>git clone --recursive https://<username>@scm.trinitydesktop.org/scm/git/tde</nowiki>
 '''NOTE: For public read-only access use "anonymous" as the username.'''
@@ Line 42: / Line 42: @@
 You may also wish to skip the numerous password prompts that will appear on first checkout; these two tasks can be accomplished with the following command:
- <nowiki>GIT_ASKPASS=echo git clone --recursive http://anonymous@scm.trinitydesktop.org/scm/git/tde</nowiki>
+ <nowiki>GIT_ASKPASS=echo git clone --recursive https://anonymous@scm.trinitydesktop.org/scm/git/tde</nowiki>
 ===To check out a single project===
@@ Line 48: / Line 48: @@
 Find the project you are interested in on the public web interface
- <nowiki>git clone http://<username>@scm.trinitydesktop.org/scm/git/<project name></nowiki>
+ <nowiki>git clone https://<username>@scm.trinitydesktop.org/scm/git/<project name></nowiki>
  cd <project name>
  git submodule init