Source Code Repository
-Mesa uses git +Mesa uses git as its source code management system.
The master git repository is hosted on -freedesktop.org. +freedesktop.org.
@@ -28,10 +35,10 @@ You may access the repository either as an
You may also -browse the main Mesa git repository and the -Mesa demos and tests git repository. +browse the main Mesa git repository and the +Mesa demos and tests git repository.
@@ -42,65 +49,60 @@ To get the Mesa sources anonymously (read-only):-
-
- Install the git software on your computer if needed.
+ - Install the git software on your computer if needed.
- Get an initial, local copy of the repository with:
-
- git clone git://anongit.freedesktop.org/git/mesa/mesa -
+git clone https://gitlab.freedesktop.org/mesa/mesa.git
- Later, you can update your tree from the master repository with:
-
- git pull origin -
+git pull origin
- If you also want the Mesa demos/tests repository:
-
- git clone git://anongit.freedesktop.org/git/mesa/demos -
+git clone https://gitlab.freedesktop.org/mesa/demos.git
Developer git Access
-Mesa developers need to first have an account on -freedesktop.org. -To get an account, please ask Brian or the other Mesa developers for -permission. -Then, if there are no objections, follow this - -procedure. -
- --Once your account is established: +If you wish to become a Mesa developer with gitlab merge privilege, please +follow this procedure:
--
-
- Install the git software on your computer if needed.
- - Get an initial, local copy of the repository with:
-
- git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa -
- Replace username with your actual login name.
- - Later, you can update your tree from the master repository with:
-
- git pull origin -
- - If you also want the Mesa demos/tests repository:
-
- git clone git+ssh://username@git.freedesktop.org/git/mesa/demos -
+ - Subscribe to the +mesa-dev +mailing list. +
- Start contributing to the project by
+submitting patches. Specifically,
+
-
+
- Use gitlab to create your merge requests. +
- Wait for someone to review the code and give you a
Reviewed-by+statement. + - You'll have to rely on another Mesa developer to push your initial patches +after they've been reviewed. +
- After you've demonstrated the ability to write good code and have had +a dozen or so patches accepted, a maintainer may use their discretion to give +you access to merge your own code.
Pushing code to your gitlab account via HTTPS
+ +Useful for people behind strict proxies
+ +You can use personal access tokens +to push over HTTPS if ssh will does not suit your needs. +In this case, create a token, and put it in the url as shown here: ++git remote set-url --push origin https://USER:TOKEN@gitlab.freedesktop.org/your~user~name/mesa.git +
Windows Users
-If you're +If you're using git on Windows you'll want to enable automatic CR/LF conversion in your local copy of the repository:
- git config --global core.autocrlf true +git config --global core.autocrlf true
@@ -110,7 +112,6 @@ and to LF on commit.
Unix users don't need to set this option.
-Development Branches
@@ -118,17 +119,17 @@ Unix users don't need to set this option.
At any given time, there may be several active branches in Mesa's
repository.
-Generally, the trunk contains the latest development (unstable)
+Generally, master contains the latest development (unstable)
code while a branch has the latest stable code.
-The command git-branch will list all available branches.
+The command git branch will list all available branches.
Questions about branch status/activity should be posted to the -mesa3d-dev mailing list. +mesa-dev mailing list.
Developer Git Tips
@@ -140,8 +141,8 @@ If you try to do a pull by just saying git pull
and git complains that you have not specified a
branch, try:
- git config branch.master.remote origin - git config branch.master.merge master +git config branch.master.remote origin +git config branch.master.merge master
Otherwise, you have to say git pull origin master
@@ -149,7 +150,7 @@ each time you do a pull.
-If you are an experienced git user working on substancial modifications, +If you are an experienced git user working on substantial modifications, you are probably working on a separate branch and would rebase your branch prior to merging with master. @@ -160,7 +161,7 @@ unnecessary and distracting branch in master.
If it has been awhile since you've done the initial clone, try
- git pull +git pull
to get the latest files before you start working. @@ -168,8 +169,8 @@ to get the latest files before you start working.
Make your changes and use
- git add <files to commit> - git commit +git add <files to commit> +git commit
to get your changes ready to push back into the fd.o repository. @@ -184,8 +185,8 @@ where you did your last pull and merging it to a point after the other changes.
To avoid this,
- git pull --rebase - git push +git pull --rebase +git push
If you are familiar with CVS or similar system, this is similar to doing a
@@ -193,7 +194,8 @@ If you are familiar with CVS or similar system, this is similar to doing a
the current repository state, instead of the time you did the last update.
(CVS doesn't work like git in this respect, but this is easiest way
to explain it.)
-
+
In any case, your repository now looks like you made your changes after all the other changes.
@@ -205,13 +207,14 @@ those before doing the push.If you want the rebase action to be the default action, then
- git config branch.master.rebase true - git config --global branch.autosetuprebase=always +git config branch.master.rebase true +git config --global branch.autosetuprebase=always
-See Understanding Git Conceptually for a fairly clear explanation about all of this. +See Understanding Git Conceptually for a fairly clear explanation about all of this.
+