DRM Migration to Gitlab

DRM Migration to Gitlab

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

Hi,

Sima, after becoming aware of the drm-misc transition to Gitlab in the
next couple of weeks, to do the same for DRM today.

This is now done and all the various bits (nightly.conf, MAINTAINERS,
doc, etc.) should be there.

If all goes well, the only thing you'll notice is that dim will complain
about the drm remote not having the right URLs.

Any dim user should update the URL with either one of the two following
commands:

git remote set-url drm ssh://git@gitlab.freedesktop.org/drm/kernel.git
git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git

And the rest should be transparent.

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: DRM Migration to Gitlab

[Jani Nikula]

On Tue, 27 Feb 2024, Maxime Ripard <mripard@redhat.com> wrote:
> Hi,
>
> Sima, after becoming aware of the drm-misc transition to Gitlab in the
> next couple of weeks, to do the same for DRM today.
>
> This is now done and all the various bits (nightly.conf, MAINTAINERS,
> doc, etc.) should be there.
>
> If all goes well, the only thing you'll notice is that dim will complain
> about the drm remote not having the right URLs.
>
> Any dim user should update the URL with either one of the two following
> commands:
>
> git remote set-url drm ssh://git@gitlab.freedesktop.org/drm/kernel.git
> git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git
>
> And the rest should be transparent.

Except it isn't. If you do that before updating to new nightly.conf,
it'll complain that the URL it sees in the old config isn't available,
and prompts.

If you first do 'dim ub', and then do 'dim ub' again, before changing
the URL, it'll also prompt, but it's unable to override the existing drm
remote.

I think dim should be updated to handle all of this without user
manually doing anything other than answering a yes/no prompt.


BR,
Jani.


-- 
Jani Nikula, Intel

Re: DRM Migration to Gitlab

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 2011 bytes --]

Hi Jani,

On Tue, Feb 27, 2024 at 10:29:01AM +0200, Jani Nikula wrote:
> On Tue, 27 Feb 2024, Maxime Ripard <mripard@redhat.com> wrote:
> > Hi,
> >
> > Sima, after becoming aware of the drm-misc transition to Gitlab in the
> > next couple of weeks, to do the same for DRM today.
> >
> > This is now done and all the various bits (nightly.conf, MAINTAINERS,
> > doc, etc.) should be there.
> >
> > If all goes well, the only thing you'll notice is that dim will complain
> > about the drm remote not having the right URLs.
> >
> > Any dim user should update the URL with either one of the two following
> > commands:
> >
> > git remote set-url drm ssh://git@gitlab.freedesktop.org/drm/kernel.git
> > git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git
> >
> > And the rest should be transparent.
> 
> Except it isn't. If you do that before updating to new nightly.conf,
> it'll complain that the URL it sees in the old config isn't available,
> and prompts.
> 
> If you first do 'dim ub', and then do 'dim ub' again, before changing
> the URL, it'll also prompt, but it's unable to override the existing drm
> remote.

Urgh, you're right... It's also partly due to drm-tip being the last
repo to be updated. I've overlooked that aspect since I had the local
changes to nightly.conf.

> I think dim should be updated to handle all of this without user
> manually doing anything other than answering a yes/no prompt.

I've started to work on that, but it's probably going to take a bit of
time to figure it out, bash isn't really my strong suit.

If anyone is stuck with this, you can get unstuck manually by doing:

cd $DIM_PREFIX/drm-rerere
git checkout rerere-cache
git pull

cd $DIM_PREFIX/kernel
git remote set-url drm ...

There's been reports in private that some didn't get their branch
updated for some time and will have to add the drm/xe repo too:

git remote add drm-xe ssh://git@gitlab.freedesktop.org/drm/xe/kernel.git

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: DRM Migration to Gitlab

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]

On Tue, Feb 27, 2024 at 10:18:01AM +0100, Maxime Ripard wrote:
> Hi Jani,
> 
> On Tue, Feb 27, 2024 at 10:29:01AM +0200, Jani Nikula wrote:
> > On Tue, 27 Feb 2024, Maxime Ripard <mripard@redhat.com> wrote:
> > > Hi,
> > >
> > > Sima, after becoming aware of the drm-misc transition to Gitlab in the
> > > next couple of weeks, to do the same for DRM today.
> > >
> > > This is now done and all the various bits (nightly.conf, MAINTAINERS,
> > > doc, etc.) should be there.
> > >
> > > If all goes well, the only thing you'll notice is that dim will complain
> > > about the drm remote not having the right URLs.
> > >
> > > Any dim user should update the URL with either one of the two following
> > > commands:
> > >
> > > git remote set-url drm ssh://git@gitlab.freedesktop.org/drm/kernel.git
> > > git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git
> > >
> > > And the rest should be transparent.
> > 
> > Except it isn't. If you do that before updating to new nightly.conf,
> > it'll complain that the URL it sees in the old config isn't available,
> > and prompts.
> > 
> > If you first do 'dim ub', and then do 'dim ub' again, before changing
> > the URL, it'll also prompt, but it's unable to override the existing drm
> > remote.
> 
> Urgh, you're right... It's also partly due to drm-tip being the last
> repo to be updated. I've overlooked that aspect since I had the local
> changes to nightly.conf.
> 
> > I think dim should be updated to handle all of this without user
> > manually doing anything other than answering a yes/no prompt.
> 
> I've started to work on that, but it's probably going to take a bit of
> time to figure it out, bash isn't really my strong suit.

I've sent a MR to handle this:

https://gitlab.freedesktop.org/drm/maintainer-tools/-/merge_requests/39

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: DRM Migration to Gitlab

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]

Hi,

On Tue, Feb 27, 2024 at 09:16:35AM +0100, Maxime Ripard wrote:
> Sima, after becoming aware of the drm-misc transition to Gitlab in the
> next couple of weeks, to do the same for DRM today.
> 
> This is now done and all the various bits (nightly.conf, MAINTAINERS,
> doc, etc.) should be there.
> 
> If all goes well, the only thing you'll notice is that dim will complain
> about the drm remote not having the right URLs.
> 
> Any dim user should update the URL with either one of the two following
> commands:
> 
> git remote set-url drm ssh://git@gitlab.freedesktop.org/drm/kernel.git
> git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git
> 
> And the rest should be transparent.

So, it turns out it wasn't.

With the help of Lucas, Jani and Sima today we rolled something that
will convert anyone that hasn't changed anything yet automatically. The
only thing you need to do is run `dim ub` *twice* and you'll be prompted
to update the URL on the second run.

If you've followed the instructions above and got stuck somewhere in the
middle, you can get back to the state before today and then start over
like described above by doing:

cd $DIM_PREFIX/drm-rerere
git checkout rerere-cache
git reset --hard 044940a15536

cd $DIM_PREFIX/maintainer-tools
git checkout master
git reset --hard 0c154c094f54

cd $DIM_PREFIX/kernel
git remote set-url drm ssh://git.freedesktop.org/git/drm/drm

dim ub
dim ub

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]