It may be desired to tag separately from the pull request creation.
Either because we want more tests to happen on the tag or because
we want to tag something that is not the tip of the branch. The latter
is useful if there were last minute pushes to -next and it still didn't
receive the proper amount of testing in linux-next to be part of a pull
request.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

There's no need to tag once with the template message and another time
with the final message. Just tag it once and avoid accidentally pushing
the tag with a template message.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

With the drm-misc migration to Gitlab, all the URLs have changed so
reflect that in the doc.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

Lucas De Marchi authored 1 year ago and Lucas De Marchi committed 1 year ago

Be explicit about signing by using `git tag -s` to create a signed tag.
This allows one to simply use what's configured in git (maybe globally
in ~/.gitconfig) rather than replicating the config in dim.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

With the drm-tip migration to Gitlab, all the URLs have changed so
reflect that in the doc.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

Add 'b4-shazam-branch' and 'b4-shazam' subcommands to apply a patch
series using b4 [1], fetching the patches from Lore. You can either
specify the series using message-id on the command-line, or by piping a
message in the series to the subcommand. Additional b4 command-line
options may be specified as needed, for example to apply individual
patches.

b4 is a much more robust alternative to pretty much everything we do in
dim_apply_branch() and apply_patch() functions, and automatically
gathers reviews and acks from the list.

Use the b4.trailers-ignore-from config to ignore trailers from CI and
kernel build bot. b4 v0.13 or later is required to filter all trailers
in messages from the mentioned addresses (for example Fixes:
trailers). Otherwise b4 shazam picks up a lot of garbage trailers from
CI mails.

[1] https://b4.docs.kernel.org/en/latest/index.html



v3:
- Unconditionally require b3 v0.13 or later
- Use --config option instead of env vars
- Add DIM_B4 config option

v2:
- Use GIT_CONFIG_* to set b4.linkmask (Lucas)
- Use GIT_CONFIG_* to set b4.trailers-ignore-from
- Check for b4 command
- Check b4 version for cover trailers
- Use subcommand names b4-shazam and b4-shazam-branch

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

update-i915-driver-date subcommand was listed as update-i.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

As part of the transition of DRM from cgit to Gitlab, we updated
drm-rerere's nightly.conf file to reflect the new URL.

However, dim updates drm first and drm-tip lasts, so if you update the
git remote URL like we instructed before running dim update-branches (or
any command that fetch all remotes), it will error out before it has the
chance to retrieve the nightly.conf file.

If the user doesn't update the git remote URL, then dim update-branch
will run, fetch drm through the cgit repo, update nightly.conf. On the
second run, it will detect that the URL doesn't match anymore, but since
there's already a drm remote setup, it will fail to add the remote.

So, in either case, dim's broken.

Add a bit of logic that detects the drm remote URL and will update
remote url if we're using our legacy URLs.

Co-developed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

dim -d pull-request was failing with:

	Using drm/drm-next as the upstream
	../maintainer-tools/dim: line 2225: gitk: command not found
	git tag -F- drm-xe-next-2024-02-27 drm-xe-next@{upstream}
	git tag -a -f drm-xe-next-2024-02-27
	error: src refspec drm-xe-next-2024-02-27 does not match any
	error: failed to push some refs to 'ssh://gitlab.freedesktop.org/drm/xe/kernel.git'

Make it a little bit more useful. Probably we shouldn't skip that much,
but that can be left for later. Same command now shows:

	Using drm/drm-next as the upstream
	../maintainer-tools/dim: line 2229: gitk: command not found
	git tag -F- drm-xe-next-2024-02-27 drm-xe-next@{upstream}
	git tag -a -f drm-xe-next-2024-02-27
	To ssh://gitlab.freedesktop.org/drm/xe/kernel.git


	 * [new tag]                     b2121f2bd2232cd0556b2182078d159d81497885 -> drm-xe-next-2024-02-27
	Skip.
	neomutt -s [PULL] drm-xe-next -i /tmp/tmp.eu5PC10boN -c Jani Nikula <jani.nikula@linux.intel.com> -c Joonas Lahtinen <joonas.lahtinen@linux.intel.com> -c Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> -c Rodrigo Vivi <rodrigo.vivi@intel.com> -c Thomas Zimmermann <tzimmermann@suse.de> -c Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -c Maxime Ripard <mripard@kernel.org> -c Thomas Hellström <thomas.hellstrom@linux.intel.com> -c Oded Gabbay <ogabbay@kernel.org> -c Lucas De Marchi <lucas.demarchi@intel.com> -c dri-devel@lists.freedesktop.org -c intel-gfx@lists.freedesktop.org -c intel-xe@lists.freedesktop.org -c dim-tools@lists.freedesktop.org Dave Airlie <airlied@gmail.com> Daniel Vetter <daniel.vetter@ffwll.ch>

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Not all repos have a git:// protocol enabled. Once upon a time the
justification to use it was due to bad performance of the https backend.
https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols

 still
marks it as "the best on performance", but with the Smart HTTP backend,
the cons start to have a bigger role. Also worth noting that it's not
available on Github and Gitlab anymore due to security issues.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

The main repository has been moved to Gitlab, so update the URL in the
documentation.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Cherry-picks caused some issues in the past and are non-linear,
maintainer's only operations.

We never documented though, so let's make it clear in our doc.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

This tool is not being used and not being maintained anymore. Remove it
so we don't have to keep solving new issues shown by shellcheck like:

	In qf line 81:
		branch=${quilt_branch#$QUILT_PREFIX}
				      ^-----------^ SC2295 (info): Expansions inside ${..} need to be quoted separately, otherwise they match as patterns.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Joonas Lahtinen authored 1 year ago and Lucas De Marchi committed 1 year ago

Fix cherry-pick-fixes to actually work after the generalization effort.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Lucas De Marchi authored 1 year ago and Lucas De Marchi committed 1 year ago

When checking if a url matches one of the urls from the drm_tip_repos
array, commit faa12d34 ("dim_setup: Use "repo" for remote default
name") used a substring match. However, it's possible that a url is a
substring of another, leading to the wrong repo being returned.

Depending on the order of iteration in the drm_tip_repo array,
ssh://git.freedesktop.org/git/drm/drm would match as a substring
of ssh://git.freedesktop.org/git/drm/drm-intel, thus returning drm-intel
rather than drm as repo.

It doesn't always fail because Bash doesn't guarantee the order of
associative arrays. Running with Bash 5.2.15 it works, because it
compares drm's url before drm-intel's. However it was reported that
with 5.0.17 it doesn't follow the same order, and thus causing this
issue.

On a dim setup execution, it errors out like this:

	dim: No git remote for any of the URLs ssh://git.freedesktop.org/git/drm/drm git://anongit.freedesktop.org/drm/drm https://anongit.freedesktop.org/git/drm/drm https://anongit.freedesktop.org/git/drm/drm.git

 found in /path/to/src
	Enter a name to auto-add this remote, leave blank to abort: drm-intel
	error: remote drm-intel already exists.

Also, dim should probably start using `set -e`, because the error above
is ignored and in the end it shows:

	dim setup successfully completed!

Leaving a half-baked setup.

Reported-by: John Harrison <john.c.harrison@intel.com>
Fixes: faa12d34 ("dim_setup: Use "repo" for remote default name")
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Thomas Hellström authored 1 year ago and Lucas De Marchi committed 1 year ago

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

No need to be silent on a y/n reply.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Fix error when not using --yes:

	"dim: line 187: [: -eq: unary operator expected"

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Remove the hardcode arguments to drm-intel branches and add support for
xe. For any future branch, all that would be needed is the mapping
between branch and arguments.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

It doesn't accept additional cherry-pick arguments.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Instead of hardcoding the remote name, derive it from the branch.
This will help adding support for xe.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Leftover from previous refactors, not used anymore.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Instead of slicing the url and deriving the default name for a remote
from there, use a new url_to_repo function to find the name from the
nightly.conf. This fixes the default name for the drm-xe repo being
called "kernel" since the url is gitlab.freedesktop.org/drm/xe/kernel.git

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Remembering the right name is a 50% chance, but 90% of them I try with
the same name used by git. Stop fighting muscle memory and support both.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

On a slow network, most of the time for a setup is taken by the initial
clone of the kernel repository. It's common for kernel developers to
have a kernel clone lying around, so allow to borrow the git objects
from there.

Testing on a relatively fast connection, the initial checkout goes down
from ~7m45s to 2m21s.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

It's tedious to run setup and having to be around for each prompt. Just
add a -y|--yes switch like we have in package managers to assume
yes/default.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

The amount of repos/branches is not restricted to the ones in drm-intel
and drm-misc anymore. Now there are topic branches on drm repo and also
the drm-xe repo. Use wildcard matches to list anything under drm-* repos
and any topic branch, even those on drm repo.

One main difference is that now `dim create-workdir all` will really
checkout all topic branches. Users may be advised to checkout only what
it's interesting for them.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Add initial documentation describing the xe rules and flow. Also add
the xe maintainers to the dim pull request cc list.

v2:
- Updates suggested by Lucas

v3:
- More updates suggested by Lucas

v4:
- Updates suggested by Oded and Jani.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

I occasionally bounce patches to intel-gfx@ to get CI for patches that
were only sent to dri-devel@ or were caught in the moderation
queue. This results in a Resent-From: header being added.

Applying such a patch leads to the From: match in apply_patch() to match
Resent-From: rather than the actual From:. If whoever bounced the patch
is also applying the patch, their Signed-off-by won't be automatically
added.

Match From: from the beginning of the line to fix this.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Since commit e700ea2f ("dim: Introduce a new configuration file in
.config/dim") it's not possible to run `dim checkpatch` anymore without
a config file. Check for the existence of both $XDG_CONFIG_HOME/dim/dimrc
and $HOME/.dimrc before sourcing them.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

The dim configuration has been stored in ~/.dimrc so far, but using
XDG_CONFIG_HOME allows for a tidier home directory.

Introduce a new XDG_CONFIG_HOME/dim/dimrc path.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

The code has multiple places where the .dim-last-path file is
referenced, so let's move it to a variable.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

We currently always cat .dim-last-path and cd to whatever content it
has.

However, it's not guarantee to exists, so the initial cat might not
work. Make sure we only switch to it if the file exists in the first
place.

Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

bash_completion is sourced from the shell, and thus a call to exit will
kill the current shell session.

Return instead.

Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

Time to switch over.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Sphinx now requires setting the language:

Invalid configuration value found: 'language = None'. Update your
configuration to a valid language code. Falling back to 'en' (English).

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

As we checkpatch the applied commits rather than the patches, avoid
mailmap conversions, if any. Otherwise we might get complaints about
author Signed-off-by missing.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>