Discussion:
[Mesa-dev] [PATCH mesa 1/2] docs: update repo URLs after GitLab move
Eric Engestrom
2018-09-21 13:46:16 UTC
Permalink
I also updated the developer instructions; presumably someone who's been
given commit rights already knows how to clone a repository :)

A more useful thing is to show how to update the pushurl, and how to use
access tokens to push over HTTPS (especially for us at Intel, where
non-http traffic is a pain).

Signed-off-by: Eric Engestrom <***@intel.com>
---
docs/download.html | 6 +++---
docs/helpwanted.html | 2 +-
docs/repository.html | 35 ++++++++++++++---------------------
docs/shading.html | 2 +-
docs/sourcedocs.html | 2 +-
docs/utilities.html | 2 +-
docs/vmware-guest.html | 4 ++--
7 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index 6b2b60cd606cb1c86868..86b4d5063c590bd69aae 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -102,9 +102,9 @@ <h1>Demos, GLUT, and GLU</h1>
Mesa releases. But since GLUT, GLU and the demos change infrequently, they
were split off into their own git repositories:

-<a href="https://cgit.freedesktop.org/mesa/glut/">GLUT</a>,
-<a href="https://cgit.freedesktop.org/mesa/glu/">GLU</a> and
-<a href="https://cgit.freedesktop.org/mesa/demos/">Demos</a>,
+<a href="https://gitlab.freedesktop.org/mesa/glut">GLUT</a>,
+<a href="https://gitlab.freedesktop.org/mesa/glu">GLU</a> and
+<a href="https://gitlab.freedesktop.org/mesa/demos">Demos</a>,
</p>

</div>
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 9b7b5e000467f7196349..f9583e6761a33538ba43 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -47,7 +47,7 @@ <h1>Help Wanted / To-Do List</h1>
<b>Common To-Do lists:</b>
</p>
<ul>
- <li><a href="https://cgit.freedesktop.org/mesa/mesa/tree/docs/features.txt">
+ <li><a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/features.txt">
<b>features.txt</b></a> - Status of OpenGL 3.x / 4.x features in Mesa.</li>
</ul>

diff --git a/docs/repository.html b/docs/repository.html
index 802c9a235cb28fa4e801..4f2b02d10f14da948c7b 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -35,9 +35,9 @@ <h1>Code Repository</h1>

<p>
You may also
-<a href="https://cgit.freedesktop.org/mesa/mesa/"
+<a href="https://gitlab.freedesktop.org/mesa/mesa"
browse the main Mesa git repository</a> and the
-<a href="https://cgit.freedesktop.org/mesa/demos"
+<a href="https://gitlab.freedesktop.org/mesa/demos"
Mesa demos and tests git repository</a>.
</p>

@@ -52,7 +52,7 @@ <h2 id="anonymous">Anonymous git Access</h2>
<li>Install the git software on your computer if needed.<br><br>
<li>Get an initial, local copy of the repository with:
<pre>
- git clone git://anongit.freedesktop.org/git/mesa/mesa
+ git clone https://gitlab.freedesktop.org/mesa/mesa.git
</pre>
<li>Later, you can update your tree from the master repository with:
<pre>
@@ -60,7 +60,7 @@ <h2 id="anonymous">Anonymous git Access</h2>
</pre>
<li>If you also want the Mesa demos/tests repository:
<pre>
- git clone git://anongit.freedesktop.org/git/mesa/demos
+ git clone https://gitlab.freedesktop.org/mesa/demos.git
</pre>
</ol>

@@ -98,24 +98,17 @@ <h2 id="developer">Developer git Access</h2>
</ol>

<p>
-Once your account is established:
-</p>
+Once your account is established, you can update your push url to use SSH:
+<pre>
+git remote set-url --push <em>origin</em> ***@gitlab.freedesktop.org:mesa/mesa.git
+</pre>

-<ol>
-<li>Get an initial, local copy of the repository with:
- <pre>
- git clone git+ssh://***@git.freedesktop.org/git/mesa/mesa
- </pre>
- Replace <em>username</em> with your actual login name.<br><br>
-<li>Later, you can update your tree from the master repository with:
- <pre>
- git pull origin
- </pre>
-<li>If you also want the Mesa demos/tests repository:
- <pre>
- git clone git+ssh://***@git.freedesktop.org/git/mesa/demos
- </pre>
-</ol>
+You can also use <a href="https://gitlab.freedesktop.org/profile/personal_access_tokens">personal access tokens</a>
+to push over HTTPS instead (useful for people behind strict proxies, like Intel).
+In this case, create a token, and put it in the url as shown here:
+<pre>
+git remote set-url --push <em>origin</em> https://<em>USER</em>:<em>TOKEN</em>@gitlab.freedesktop.org/mesa/mesa.git
+</pre>


<h2>Windows Users</h2>
diff --git a/docs/shading.html b/docs/shading.html
index a0bbe997c1b8eeea572f..9e3c7218e31e5ad8385c 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -85,7 +85,7 @@ <h3 id="capture">Capturing Shaders</h3>
<p>
Setting <b>MESA_SHADER_CAPTURE_PATH</b> to a directory will cause the compiler
to write <tt>.shader_test</tt> files for use with
-<a href="https://cgit.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
+<a href="https://gitlab.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
which compiler developers can use to gather statistics about shaders
(instructions, cycles, memory accesses, and so on).
</p>
diff --git a/docs/sourcedocs.html b/docs/sourcedocs.html
index 660dcb2ef0eba3f3c061..10a0810ad22b4e31b201 100644
--- a/docs/sourcedocs.html
+++ b/docs/sourcedocs.html
@@ -31,7 +31,7 @@ <h1>Source Code Documentation</h1>

<p>
For an example of Doxygen usage in Mesa, see a recent source file
-such as <a href="https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/main/bufferobj.c">bufferobj.c</a>.
+such as <a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/src/mesa/main/bufferobj.c">bufferobj.c</a>.
</p>


diff --git a/docs/utilities.html b/docs/utilities.html
index 222e73438974eb29cb69..5d7cb17f9dccfca64498 100644
--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -17,7 +17,7 @@ <h1>The Mesa 3D Graphics Library</h1>
<h1>Development Utilities</h1>

<dl>
- <dt><a href="https://cgit.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
+ <dt><a href="https://gitlab.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
<dd>includes several utility routines in the <code>src/util/</code>
directory.</dd>

diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index dce4fc275986df934b58..4e0932e781f3e0fc6b9d 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -143,7 +143,7 @@ <h2>Getting the Latest Source Code</h2>
<ul>
<li>Mesa/Gallium master branch. This code is used to build libGL, and the direct rendering svga driver for libGL, vmwgfx_dri.so, and the X acceleration library libxatracker.so.x.x.x.
<pre>
- git clone git://anongit.freedesktop.org/git/mesa/mesa
+ git clone https://gitlab.freedesktop.org/mesa/mesa.git
</pre>
<li>VMware Linux guest kernel module. Note that this repo contains the complete DRM and TTM code. The vmware-specific driver is really only the files prefixed with vmwgfx.
<pre>
@@ -153,7 +153,7 @@ <h2>Getting the Latest Source Code</h2>
Most distros ship with this but it's safest to install a newer version.
To get the latest code from git:
<pre>
- git clone git://anongit.freedesktop.org/git/mesa/drm
+ git clone https://gitlab.freedesktop.org/mesa/drm.git
</pre>
<li>xf86-video-vmware. The chainloading driver, vmware_drv.so, the legacy driver vmwlegacy_drv.so, and the vmwgfx driver vmwgfx_drv.so.
<pre>
--
Cheers,
Eric
Eric Engestrom
2018-09-21 13:46:17 UTC
Permalink
`git-branch` doesn't exist, and mesa3d-dev hasn't been used in a great
many years :)

Signed-off-by: Eric Engestrom <***@intel.com>
---
docs/repository.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/repository.html b/docs/repository.html
index 4f2b02d10f14da948c7b..b8a2a440ddc3b89a1525 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -142,12 +142,12 @@ <h2>Development Branches</h2>
</p>

<p>
-The command <code>git-branch</code> will list all available branches.
+The command <code>git branch</code> will list all available branches.
</p>

<p>
Questions about branch status/activity should be posted to the
-mesa3d-dev mailing list.
+mesa-dev mailing list.
</p>

<h2>Developer Git Tips</h2>
--
Cheers,
Eric
Emil Velikov
2018-09-21 15:29:48 UTC
Permalink
Post by Eric Engestrom
I also updated the developer instructions; presumably someone who's been
given commit rights already knows how to clone a repository :)
A more useful thing is to show how to update the pushurl, and how to use
access tokens to push over HTTPS (especially for us at Intel, where
non-http traffic is a pain).
Personally I'd omit the Intel mention (in the documentation), but it's
your call.
For the series:
Reviewed-by: Emil Velikov <***@gmail.com>

Unrelated: I wish gitlab would stop redirecting when the clone URL is
missing the .git at the end.
The redirection message git throws is fairly annoying :-\

Thanks
Emil
Dylan Baker
2018-09-21 15:36:23 UTC
Permalink
Quoting Emil Velikov (2018-09-21 08:29:48)
Post by Emil Velikov
Post by Eric Engestrom
I also updated the developer instructions; presumably someone who's been
given commit rights already knows how to clone a repository :)
A more useful thing is to show how to update the pushurl, and how to use
access tokens to push over HTTPS (especially for us at Intel, where
non-http traffic is a pain).
Personally I'd omit the Intel mention (in the documentation), but it's
your call.
I'd drop the Intel mention.
Post by Emil Velikov
Unrelated: I wish gitlab would stop redirecting when the clone URL is
missing the .git at the end.
The redirection message git throws is fairly annoying :-\
Thanks
Emil
_______________________________________________
mesa-dev mailing list
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Eric Engestrom
2018-09-22 15:52:41 UTC
Permalink
Post by Emil Velikov
Post by Eric Engestrom
I also updated the developer instructions; presumably someone who's been
given commit rights already knows how to clone a repository :)
A more useful thing is to show how to update the pushurl, and how to use
access tokens to push over HTTPS (especially for us at Intel, where
non-http traffic is a pain).
Personally I'd omit the Intel mention (in the documentation), but it's
your call.
Dropped.
Thanks!
Post by Emil Velikov
Unrelated: I wish gitlab would stop redirecting when the clone URL is
missing the .git at the end.
The redirection message git throws is fairly annoying :-\
Agreed :/
If it already figured out that it's replying a git client, it could just
do the right thing silently, like GitHub does, where having the .git at
the end of the repo url makes no difference for the client.
Post by Emil Velikov
Thanks
Emil
Loading...